This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 3046ec8d42937f9c40c124ca517568bbee04e231 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 6 13:30:50 2016 +0100 Use diamond syntax --- .../java/fr/ird/observe/ObserveActionExecutor.java | 2 +- .../fr/ird/observe/ObserveResourceManager.java | 2 +- .../ObserveSwingApplicationConfig.java | 6 ++--- .../main/java/fr/ird/observe/db/DataContext.java | 10 ++++---- .../observe/entities/longline/SectionTemplate.java | 2 +- .../entities/longline/SectionWithTemplates.java | 2 +- .../java/fr/ird/observe/ui/DecoratorService.java | 2 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 +- .../ird/observe/ui/admin/export/ExportModel.java | 2 +- .../ui/admin/gps/GPSActivityTableModel.java | 4 ++-- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 2 +- .../ird/observe/ui/admin/report/ReportModel.java | 2 +- .../observe/ui/admin/report/ReportUIHandler.java | 2 +- .../ird/observe/ui/admin/save/SaveLocalModel.java | 2 +- .../synchronize/ObsoleteEntityTableModel.java | 4 ++-- .../ird/observe/ui/content/ContentUIHandler.java | 4 ++-- .../observe/ui/content/ContentUIInitializer.java | 6 ++--- .../ird/observe/ui/content/ContentUIManager.java | 2 +- .../content/impl/longline/BranchlineUIHandler.java | 2 +- .../LonglineDetailCompositionUIHandler.java | 6 ++--- ...onglineDetailCompositionUIValidationHelper.java | 2 +- .../impl/longline/SectionTemplatesTableModel.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIModel.java | 4 ++-- .../ref/impl/LengthWeightParameterUIHandler.java | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 2 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 2 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 2 +- .../ui/content/ref/impl/VesselUIHandler.java | 2 +- .../ui/content/table/ContentTableModel.java | 14 +++++------ .../content/table/impl/longline/TdrUIHandler.java | 4 ++-- .../seine/GearUseFeatureMeasurementCellEditor.java | 2 +- .../GearUseFeatureMeasurementCellRenderer.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../ird/observe/ui/storage/RemoteUILauncher.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 2 +- .../loadors/ActivityLonglineNodeChildLoador.java | 2 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 2 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 2 +- .../fr/ird/observe/ui/util/table/EditableList.java | 4 ++-- .../ui/util/table/EditableTableModelSupport.java | 4 ++-- .../EditableTableWithCacheTableModelSupport.java | 6 ++--- .../util/table/MoveToNextEditableCellAction.java | 2 +- .../ui/util/table/MoveToNextEditableRowAction.java | 2 +- .../table/MoveToPreviousEditableCellAction.java | 2 +- .../table/MoveToPreviousEditableRowAction.java | 2 +- .../validation/ValidationMessageDetector.java | 4 ++-- .../fr/ird/observe/validation/ValidatorsMap.java | 2 +- ...glineDetailCompositionValidatorServiceTest.java | 8 +++---- .../fr/ird/observe/entities/longline/Baskets.java | 2 +- .../ird/observe/entities/longline/Branchlines.java | 2 +- .../observe/entities/longline/SectionTemplate.java | 2 +- .../entities/longline/SectionWithTemplates.java | 2 +- .../observe/entities/longline/TripLonglines.java | 2 +- .../AbstractObserveMigrationCallBack.java | 2 +- .../entities/migration/H2DataSourceMigration.java | 12 +++++----- .../entities/migration/PGDataSourceMigration.java | 12 +++++----- .../DataSourceMigrationForVersion_3_16.java | 2 +- .../DataSourceMigrationForVersion_4_0_1.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 2 +- .../referentiel/LengthWeightParameters.java | 2 +- .../referentiel/LengthWeightParemeterHelper.java | 10 ++++---- .../ird/observe/entities/seine/ActivitySeines.java | 4 ++-- .../CollectionFieldExpressionValidator2.java | 4 ++-- .../ObserveCollectionUniqueKeyValidator.java | 4 ++-- .../entities/longline/SectionTemplateTest.java | 6 ++--- .../service/actions/report/ReportBuilder.java | 28 +++++++++++----------- .../services/dto/actions/report/ReportRequest.java | 2 +- .../fr/ird/observe/util/gps/GPSFileReader.java | 10 ++++---- .../report/AbstractReportServiceRestTest.java | 2 +- .../fr/ird/observe/services/ObserveJdbcHelper.java | 4 ++-- .../observe/services/ObserveSecurityHelper.java | 10 ++++---- .../report/AbstractReportServiceTopiaTest.java | 2 +- 79 files changed, 149 insertions(+), 149 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveActionExecutor.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveActionExecutor.java index e337ec3..407e40e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveActionExecutor.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveActionExecutor.java @@ -272,7 +272,7 @@ public class ObserveActionExecutor extends ActionExecutor { executorService = new ThreadPoolExecutor(5, 10, 10L, TimeUnit.MINUTES, - new LinkedBlockingQueue<Runnable>(), + new LinkedBlockingQueue<>(), threadFactory); // appContext.put(ActionWorker.class, executorService); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java index 2ae8455..0a141a4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java @@ -104,7 +104,7 @@ public class ObserveResourceManager { public Map<String, Properties> getResources() { if (resources == null) { - resources = new TreeMap<String, Properties>(); + resources = new TreeMap<>(); } return resources; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java index 74df74c..f801e9e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java @@ -363,7 +363,7 @@ public class ObserveSwingApplicationConfig extends ApplicationConfig { public void installSaveAction() { // ajout de l'action de sauvegarde automatique sur certaines propriétés - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); for (ObserveSwingApplicationConfigOption option : ObserveSwingApplicationConfigOption.values()) { String key = option.getPropertyKey(); @@ -957,7 +957,7 @@ public class ObserveSwingApplicationConfig extends ApplicationConfig { public String[] getUnsavables() { if (unsavables == null) { - List<String> tmp = new ArrayList<String>(); + List<String> tmp = new ArrayList<>(); tmp.add(ObserveSwingApplicationConfigOption.OBSTUNA_PASSWORD.getKey()); // tmp.add(OBSTUNA_SSL_CERTIFICAT_PASSWORD.getKey()); tmp.add(ObserveSwingApplicationConfigOption.H2_PASSWORD.getKey()); @@ -1075,7 +1075,7 @@ public class ObserveSwingApplicationConfig extends ApplicationConfig { } public void removeJaxxPropertyChangeListener() { - List<String> tmp = new ArrayList<String>(); + List<String> tmp = new ArrayList<>(); for (ObserveSwingApplicationConfigOption option : ObserveSwingApplicationConfigOption.values()) { String propertyName = option.getPropertyKey(); if (propertyName != null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java index 47436bf..4e643a6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java @@ -443,7 +443,7 @@ public class DataContext extends AbstractSerializableBean { public String[] getSelectedIds() { - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); for (DataContextType type : getTypes()) { String result = type.getSelectedId(this); @@ -456,7 +456,7 @@ public class DataContext extends AbstractSerializableBean { public String[] getOpenIds() { - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); for (DataContextType type : getTypes()) { String result = type.getOpenId(this); @@ -473,7 +473,7 @@ public class DataContext extends AbstractSerializableBean { if (isOpenProgram()) { - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); ids.add(getOpenProgramId()); if (!ProgramDto.class.equals(type) && isOpenTrip()) { @@ -605,7 +605,7 @@ public class DataContext extends AbstractSerializableBean { List<String> realSelection = null; if (selectedId != null && selectedId.length > 0) { - realSelection = new ArrayList<String>(); + realSelection = new ArrayList<>(); for (String s : selectedId) { if (s == null) { @@ -659,7 +659,7 @@ public class DataContext extends AbstractSerializableBean { } List<String> oldSelection = Arrays.asList(getOpenIds()); - List<String> realSelection = new ArrayList<String>(); + List<String> realSelection = new ArrayList<>(); if (openIds != null && openIds.length > 0) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java b/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java index 67eae53..ec1ed81 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java @@ -94,7 +94,7 @@ public class SectionTemplate extends AbstractSerializableBean { public List<Float> getFloatlineLengthsAsList() { String[] parts = floatlineLengths.split("\\/"); - List<Float> newLengths = new ArrayList<Float>(parts.length); + List<Float> newLengths = new ArrayList<>(parts.length); for (String part : parts) { Float aFloat = Float.valueOf(part); newLengths.add(aFloat); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java b/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java index fea98e1..565bd78 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java @@ -50,7 +50,7 @@ public class SectionWithTemplates { public static List<SectionWithTemplate> getSectionTemplates(Collection<SectionDto> sections) { - List<SectionWithTemplate> sectionTemplates = new ArrayList<SectionWithTemplate>(); + List<SectionWithTemplate> sectionTemplates = new ArrayList<>(); if (sections != null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index ef4d553..c5e06b7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -211,7 +211,7 @@ public class DecoratorService extends DecoratorProvider { } public List<Class<? extends IdDto>> sortTypes(Collection<Class<? extends IdDto>> types) { - final Map<Class<?>, String> cache = new HashMap<Class<?>, String>(); + final Map<Class<?>, String> cache = new HashMap<>(); List<Class<? extends IdDto>> list = Lists.newArrayList(types); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 422d46a..61e2938 100755 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -145,7 +145,7 @@ public class ObserveMainUIHandler { Class<? extends ObserveContentUI<?>> uiClass) { // compute the selected ids to put in data context Object[] nodes = path.getPath(); - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); for (Object o : nodes) { ObserveNode n = (ObserveNode) o; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index cc7a22f..aeca2bb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -1226,7 +1226,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { @Override protected AdminStep[] updateStepUniverse() { - List<AdminStep> universe = new ArrayList<AdminStep>(); + List<AdminStep> universe = new ArrayList<>(); // toujours l'onglet de configuration des objectOperations universe.add(AdminStep.CONFIG); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java index 8b8f901..b545560 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java @@ -167,7 +167,7 @@ public class ExportModel extends AdminActionModel { public List<TripEntry> getSelectedTrips() { - List<TripEntry> entries = new ArrayList<TripEntry>(); + List<TripEntry> entries = new ArrayList<>(); for (int index : exportDataSelectedIndex) { entries.add(data.get(index)); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java index 704784d..cd94a5e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java @@ -73,7 +73,7 @@ public class GPSActivityTableModel extends AbstractTableModel { protected Decorator<?> decorator; public GPSActivityTableModel() { - selected = new HashSet<Integer>(); + selected = new HashSet<>(); decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecorator(ActivitySeineDto.class, "gps-activity"); } @@ -90,7 +90,7 @@ public class GPSActivityTableModel extends AbstractTableModel { public void init(Map<ActivitySeineDto, GPSPoint> entries) { // on nettoye toujours le model lors de l'init d'une entité - this.entries = new ArrayList<Entry<ActivitySeineDto, GPSPoint>>( + this.entries = new ArrayList<>( entries.entrySet()); selected.clear(); // par defaut, on selectionne toutes les references diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java index 0b1741c..704490a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java @@ -497,7 +497,7 @@ public class ImportGPSUIHandler extends AdminTabUIHandler { /** detection des points gps pour les activitys trouvees. */ protected void detectPoints() { - Set<ActivitySeineDto> rejected = new HashSet<ActivitySeineDto>(); + Set<ActivitySeineDto> rejected = new HashSet<>(); for (ActivitySeineDto a : data.keySet()) { Date time = a.getTime(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java index 5408802..b25ad6b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java @@ -99,7 +99,7 @@ public class ReportModel extends AdminActionModel { public ReportModel() { super(AdminStep.REPORT); - variables = new TreeMap<String, Object>(); + variables = new TreeMap<>(); } public List<Report> loadReports(URL resource) throws IOException { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java index f8d4ab0..de04c66 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java @@ -360,7 +360,7 @@ public class ReportUIHandler extends AdminTabUIHandler { // String value = variables.get(variableName); Set values = variable.getValues(); List<Object> universe = Lists.newArrayList(values); - BeanComboBox<Object> combo = new BeanComboBox<Object>(); + BeanComboBox<Object> combo = new BeanComboBox<>(); combo.setShowReset(true); variablesPanel.add(combo); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java index 51ea923..9b5172e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java @@ -104,7 +104,7 @@ public class SaveLocalModel extends AdminActionModel { public Set<AdminStep> getStepsForSave() { if (stepsForSave == null) { - stepsForSave = new HashSet<AdminStep>(); + stepsForSave = new HashSet<>(); } return stepsForSave; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java index 6f43444..0d9fa05 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java @@ -55,7 +55,7 @@ public class ObsoleteEntityTableModel extends AbstractTableModel { protected boolean selectAll; public ObsoleteEntityTableModel() { - selected = new HashSet<Integer>(); + selected = new HashSet<>(); } @Override @@ -79,7 +79,7 @@ public class ObsoleteEntityTableModel extends AbstractTableModel { // } public List<Integer> getSelectedIndex() { - return new ArrayList<Integer>(selected); + return new ArrayList<>(selected); } //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index f155134..05bfa42 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -1086,8 +1086,8 @@ public abstract class ContentUIHandler<E extends IdDto> { return getDecoratorService().getReferentialReferenceDecorator(dtoType); } - private final <D extends ReferentialDto> ReferentialReferenceSet<D> filterReferentialReferenceSet(ReferenceSetRequestKeyDefinition<D> propertyDefinition, - ReferentialReferenceSet<D> incomingReferentialReferenceSet) { + private <D extends ReferentialDto> ReferentialReferenceSet<D> filterReferentialReferenceSet(ReferenceSetRequestKeyDefinition<D> propertyDefinition, + ReferentialReferenceSet<D> incomingReferentialReferenceSet) { Class<D> dtoType = propertyDefinition.getType(); String propertyName = propertyDefinition.getName(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 8426475..97fa6b2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -203,7 +203,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E // initialisation des éditeurs - Set<String> doNotBlockComponentIds = new HashSet<String>(); + Set<String> doNotBlockComponentIds = new HashSet<>(); for (String name : ui.get$objectMap().keySet()) { Object o = ui.getObjectById(name); @@ -613,7 +613,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E list.putClientProperty("decorator", decorator); - list.init(decorator, new ArrayList<DataReference<D>>(), new ArrayList<DataReference<D>>()); + list.init(decorator, new ArrayList<>(), new ArrayList<>()); JList<AbstractReference<D>> selectedList = list.getSelectedList(); ListCellRenderer<? super AbstractReference<D>> renderer = selectedList.getCellRenderer(); @@ -639,7 +639,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E list.putClientProperty("decorator", decorator); - list.init(decorator, new ArrayList<ReferentialReference<D>>(), new ArrayList<ReferentialReference<D>>()); + list.init(decorator, new ArrayList<>(), new ArrayList<>()); JList<AbstractReference<D>> selectedList = list.getSelectedList(); ListCellRenderer<? super AbstractReference<D>> renderer = selectedList.getCellRenderer(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 6a5ac2b..9ac0caf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -118,7 +118,7 @@ public class ContentUIManager { public ContentUIManager(ObserveMainUI ui) { this.ui = ui; - mapping = new TreeMap<String, Class<? extends ObserveContentUI<?>>>(); + mapping = new TreeMap<>(); // --- Seine data --- // addMapping(DATA, ProgramDto.class, GearType.seine.name(), TripSeinesUI.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java index bb8d908..694e34b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java @@ -340,7 +340,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 3089436..7c415ef 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -574,7 +574,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong BasketsTableModel basketsTableModel = getBasketsTableModel(); BranchlinesTableModel branchlinesTableModel = getBranchlinesTableModel(); - List<SectionWithTemplate> sections = new ArrayList<SectionWithTemplate>(nbSections); + List<SectionWithTemplate> sections = new ArrayList<>(nbSections); for (int sectionNumber = 0; sectionNumber < nbSections; sectionNumber++) { @@ -1329,7 +1329,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong // flush bask baskets to the given section List<BasketDto> baskets = basketsTableModel.getNotEmptyData(); - section.setBasket(new LinkedHashSet<BasketDto>(baskets)); + section.setBasket(new LinkedHashSet<>(baskets)); if (log.isInfoEnabled()) { log.info("Flush baskets (" + baskets.size() + ") to his section: " + sectionDecorator.toString(section)); @@ -1351,7 +1351,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong // flush bask branchlines to the given basket List<BranchlineDto> branchlines = branchlinesTableModel.getNotEmptyData(); - basket.setBranchline(new LinkedHashSet<BranchlineDto>(branchlines)); + basket.setBranchline(new LinkedHashSet<>(branchlines)); if (log.isInfoEnabled()) { log.info("Flush branchlines (" + branchlines.size() + ") to his basket: " + basketDecorator.toString(basket)); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java index d998ac9..eafdb7c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java @@ -326,7 +326,7 @@ public class LonglineDetailCompositionUIValidationHelper { private LonglineDetailCompositionValidationContext(DecoratorService decoratorService, Map<SwingValidator, JComponent> validatorEditors) { this.decoratorService = decoratorService; this.validatorEditors = validatorEditors; - this.messages = new ArrayList<SwingValidatorMessage>(); + this.messages = new ArrayList<>(); } public List<SwingValidatorMessage> getMessages() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java index ebf526a..2fdeb5f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java @@ -123,7 +123,7 @@ public class SectionTemplatesTableModel extends EditableTableModelSupport<Sectio if (newValidState) { // check that we are using unique ids - Set<String> ids = new HashSet<String>(); + Set<String> ids = new HashSet<>(); for (SectionTemplate sectionTemplate : data) { boolean add = ids.add(sectionTemplate.getId()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 0cb1c5b..da5e0d1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -400,7 +400,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 868b258..bd40ea3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -239,7 +239,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH boolean hasBalise = !bean.isTransmittingBuoyEmpty(); - List<TransmittingBuoyDto> objets = new ArrayList<TransmittingBuoyDto>(); + List<TransmittingBuoyDto> objets = new ArrayList<>(); if (!reset) { if (hasBalise) { objets.addAll(bean.getTransmittingBuoy()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 6f8cfa9..4ac6569 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -304,7 +304,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index d25981a..f18f0ba 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -347,7 +347,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java index 2a585b8..0023805 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java @@ -202,7 +202,7 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends */ protected final List<String> buildProperties(boolean usedefault, String[] properties) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); result.addAll(Arrays.asList(DEFAULT_PROPERTIES)); if (properties != null) { result.addAll(Arrays.asList(properties)); @@ -234,7 +234,7 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends */ protected final List<String> buildDataBindings(boolean usedefault, String[] dataBinding) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); result.addAll(Arrays.asList(DEFAULT_DATABINDING)); if (dataBinding != null) { result.addAll(Arrays.asList(dataBinding)); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java index 882eddc..7399a05 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java @@ -84,7 +84,7 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java index ad32cb0..589755f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java @@ -84,7 +84,7 @@ public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto> { protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java index 4b42979..0368219 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java @@ -84,7 +84,7 @@ public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListD protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java index fae41e0..a27368d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java @@ -84,7 +84,7 @@ public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto> { protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java index af18cec..2cd4968 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java @@ -84,7 +84,7 @@ public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto> { protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java index d59b1cf..72b15fe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java @@ -102,7 +102,7 @@ public abstract class ContentTableModel<P extends IdDto, B extends IdDto> extend protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); /** la liste des données du modèle */ - protected List<B> data = new ArrayList<B>(); + protected List<B> data = new ArrayList<>(); /** un drapeau pour savoir si le modèle a été modifié */ protected boolean modified; @@ -146,8 +146,8 @@ public abstract class ContentTableModel<P extends IdDto, B extends IdDto> extend String property, boolean unmodiableWhenExisting) { - return new ContentTableMeta<D>(childType, - property, unmodiableWhenExisting); + return new ContentTableMeta<>(childType, + property, unmodiableWhenExisting); } /** @@ -538,14 +538,14 @@ public abstract class ContentTableModel<P extends IdDto, B extends IdDto> extend Collection<B> childs = getChilds(bean); if (childs == null || childs.isEmpty()) { - data = new ArrayList<B>(); + data = new ArrayList<>(); } else { - data = new ArrayList<B>(childs); + data = new ArrayList<>(childs); } } else { // le modèle n'est pas encore initialisé // on retourne donc une liste vide - data = new ArrayList<B>(); + data = new ArrayList<>(); } } return data; @@ -621,7 +621,7 @@ public abstract class ContentTableModel<P extends IdDto, B extends IdDto> extend */ @SuppressWarnings({"unchecked"}) public <T> List<T> getColumnValues(int column) { - List<T> result = new ArrayList<T>(); + List<T> result = new ArrayList<>(); if (!isEmpty()) { for (int i = 0; i < getRowCount(); i++) { T value = (T) getValueAt(i, column); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index 7f0dba4..b72ee1d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -213,7 +213,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt super.initUI(); - LonglinePositionHelper<TdrDto> positionHelper = new LonglinePositionHelper<TdrDto>( + LonglinePositionHelper<TdrDto> positionHelper = new LonglinePositionHelper<>( getUi().getSection(), getUi().getBasket(), getUi().getBranchline(), @@ -396,7 +396,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java index a6c2c72..05c5217 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java @@ -98,7 +98,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { public Map<String, TableCellEditor> getEditorsByGearCaracteristicId(JTable table) { if (editorsByGearCaracteristicId == null) { - editorsByGearCaracteristicId = new TreeMap<String, TableCellEditor>(); + editorsByGearCaracteristicId = new TreeMap<>(); { // texte diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java index 5fd78dd..e00a1a1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java @@ -50,7 +50,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer public GearUseFeatureMeasurementCellRenderer(int caracteristicColumn, DefaultTableCellRenderer renderer) { this.caracteristicColumn = caracteristicColumn; - renderersByCaracteristicTypeId = new TreeMap<String, TableCellRenderer>(); + renderersByCaracteristicTypeId = new TreeMap<>(); { // texte diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 851e552..d086641 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -472,7 +472,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - Set<String> errorProperties = new HashSet<String>(); + Set<String> errorProperties = new HashSet<>(); int rowCount = errorTableModel.getRowCount(); for (int i = 0; i < rowCount; i++) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java index 2daf3dc..5083c20 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java @@ -66,7 +66,7 @@ public abstract class RemoteUILauncher extends StorageUILauncher { model.setDbMode(DbMode.USE_REMOTE); model.setAdminAction(action); - List<StorageStep> steps = new ArrayList<StorageStep>(); + List<StorageStep> steps = new ArrayList<>(); steps.add(StorageStep.CHOOSE_DB_MODE); steps.add(StorageStep.CONFIG); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 43b776c..51189bc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -847,7 +847,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { // pas de mode choisi donc l'univers ne change pas return; } - List<StorageStep> universe = new ArrayList<StorageStep>(); + List<StorageStep> universe = new ArrayList<>(); universe.add(StorageStep.CHOOSE_DB_MODE); boolean canBackup = localStorageExist; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 914cd0f..508b20c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -94,7 +94,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str String parentId, NavDataProvider dataService) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); result.add(ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); return result; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index 07af584..f83d25f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -60,7 +60,7 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String parentId, NavDataProvider dataProvider) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); result.add("longlineGlobalComposition"); result.add("longlineDetailComposition"); result.add(SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index bb5d7e1..dccb572 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -64,7 +64,7 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String, Str String parentId, NavDataProvider dataProvider) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); result.add(SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE); result.add(SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH); result.add(SetSeineDto.PROPERTY_TARGET_DISCARDED); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java index 0affb51..a13e91e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java @@ -122,7 +122,7 @@ public class UsagesUIHandler { } typetitle = t(typetitle, typeTitle, size); pane.setColumnHeaderView(new JLabel(typetitle)); - List<String> data = new ArrayList<String>(size); + List<String> data = new ArrayList<>(size); Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(type); if (decorator == null) { throw new NullPointerException( diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableList.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableList.java index 33f539e..19b2c35 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableList.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableList.java @@ -37,9 +37,9 @@ public class EditableList<E extends Serializable> implements Serializable { private static final long serialVersionUID = 1L; - final List<E> original = new ArrayList<E>(); + final List<E> original = new ArrayList<>(); - final List<E> data = new ArrayList<E>(); + final List<E> data = new ArrayList<>(); public List<E> getData() { return data; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java index a2bcc36..f262516 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java @@ -91,7 +91,7 @@ public abstract class EditableTableModelSupport<E extends Serializable> extends protected int selectedRowIndex = -1; /* -1 = pas de selection */ /** la liste des données du modèle */ - protected List<E> data = new ArrayList<E>(); + protected List<E> data = new ArrayList<>(); private JTable table; @@ -128,7 +128,7 @@ public abstract class EditableTableModelSupport<E extends Serializable> extends } public List<E> getNotEmptyData() { - List<E> result = new ArrayList<E>(); + List<E> result = new ArrayList<>(); for (E row : data) { if (isRowNotEmpty(row)) { result.add(row); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java index 4f4573d..42d5ad6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java @@ -54,7 +54,7 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends IdDto> e protected EditableTableWithCacheTableModelSupport() { super(true); - this.cacheByRow = new TreeMap<Integer, EditableList<E>>(); + this.cacheByRow = new TreeMap<>(); } public List<E> getCacheForRow(int rowIndex) { @@ -66,7 +66,7 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends IdDto> e EditableList<E> editableList = cacheByRow.get(editingRow); Preconditions.checkState(editableList == null, "Cant have a list for row: " + editingRow); - editableList = new EditableList<E>(); + editableList = new EditableList<>(); // Get a copy of the list (to avoid to edit the content of the list) List<E> original = copyList(data); @@ -136,7 +136,7 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends IdDto> e } protected List<E> copyList(List<E> data) { - List<E> copy = new ArrayList<E>(data.size()); + List<E> copy = new ArrayList<>(data.size()); for (E measure : data) { E originalMeasure = createNewRow(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java index c1872e9..88166de 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java @@ -47,7 +47,7 @@ public class MoveToNextEditableCellAction<M extends EditableTableModelSupport> e } public static <M extends EditableTableModelSupport> MoveToNextEditableCellAction<M> newAction(M model, JTable table) { - return new MoveToNextEditableCellAction<M>(model, table); + return new MoveToNextEditableCellAction<>(model, table); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java index ae16a41..5b9e3f7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java @@ -47,7 +47,7 @@ public class MoveToNextEditableRowAction<M extends EditableTableModelSupport> ex } public static <M extends EditableTableModelSupport> MoveToNextEditableRowAction<M> newAction(M model, JTable table) { - return new MoveToNextEditableRowAction<M>(model, table); + return new MoveToNextEditableRowAction<>(model, table); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java index 83d67fa..dbe9e77 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java @@ -47,7 +47,7 @@ public class MoveToPreviousEditableCellAction<M extends EditableTableModelSuppor } public static <M extends EditableTableModelSupport> MoveToPreviousEditableCellAction<M> newAction(M model, JTable table) { - return new MoveToPreviousEditableCellAction<M>(model, table); + return new MoveToPreviousEditableCellAction<>(model, table); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java index 656d249..513a652 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java @@ -47,7 +47,7 @@ public class MoveToPreviousEditableRowAction<M extends EditableTableModelSupport } public static <M extends EditableTableModelSupport> MoveToPreviousEditableRowAction<M> newAction(M model, JTable table) { - return new MoveToPreviousEditableRowAction<M>(model, table); + return new MoveToPreviousEditableRowAction<>(model, table); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java index 7f89288..0cc7206 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java @@ -80,8 +80,8 @@ public class ValidationMessageDetector implements SimpleBeanValidatorListener { public ValidationMessageDetector(ValidatorsMap validators) { this.validators = validators; - path = new LinkedList<IdDto>(); - explored = new HashSet<IdDto>(); + path = new LinkedList<>(); + explored = new HashSet<>(); //FIXME // refs = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(); accessorExpression = new StringBuilder(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidatorsMap.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidatorsMap.java index c4f1a03..54958f5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidatorsMap.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidatorsMap.java @@ -41,7 +41,7 @@ public class ValidatorsMap implements Map<Class<?>, SimpleBeanValidator<?>> { protected final Map<Class<?>, SimpleBeanValidator<?>> delegate; public ValidatorsMap() { - delegate = new HashMap<Class<?>, SimpleBeanValidator<?>>(); + delegate = new HashMap<>(); } public NuitonValidatorScope[] getScopes() { diff --git a/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java index 36b709d..cb2e360 100644 --- a/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java +++ b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java @@ -70,9 +70,9 @@ public class LonglineDetailCompositionValidatorServiceTest { ObserveSwingApplicationContext.set(applicationContext); DecoratorService decoratorService = new DecoratorService(ReferentialLocale.FR); - ObserveValidator<SectionDto> sectionValidator = new ObserveValidator<SectionDto>(SectionDto.class, "n1-update-table", NuitonValidatorScope.values()); - ObserveValidator<BasketDto> basketValidator = new ObserveValidator<BasketDto>(BasketDto.class, "n1-update-table", NuitonValidatorScope.values()); - ObserveValidator<BranchlineDto> branchlineValidator = new ObserveValidator<BranchlineDto>(BranchlineDto.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<SectionDto> sectionValidator = new ObserveValidator<>(SectionDto.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<BasketDto> basketValidator = new ObserveValidator<>(BasketDto.class, "n1-update-table", NuitonValidatorScope.values()); + ObserveValidator<BranchlineDto> branchlineValidator = new ObserveValidator<>(BranchlineDto.class, "n1-update-table", NuitonValidatorScope.values()); //FIXME // service = new LonglineDetailCompositionUIValidationHelper.LonglineDetailCompositionValidatorService( @@ -91,7 +91,7 @@ public class LonglineDetailCompositionValidatorServiceTest { @Test public void testValidateSections() { - List<SectionDto> sections = new ArrayList<SectionDto>(); + List<SectionDto> sections = new ArrayList<>(); { SectionDto section = new SectionDto(); section.setId("0"); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java index a4c6c39..9dd1602 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java @@ -35,7 +35,7 @@ public class Baskets { public static List<Basket> getBaskets(List<Section> sections) { - List<Basket> baskets = new ArrayList<Basket>(); + List<Basket> baskets = new ArrayList<>(); for (Section section : sections) { if (!section.isBasketEmpty()) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java index 32ea671..d1653c2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java @@ -35,7 +35,7 @@ public class Branchlines { public static List<Branchline> getBranchlines(List<Basket> baskets) { - List<Branchline> branchlines = new ArrayList<Branchline>(); + List<Branchline> branchlines = new ArrayList<>(); for (Basket basket : baskets) { if (!basket.isBranchlineEmpty()) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java index a4aee73..185bc1a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java @@ -93,7 +93,7 @@ public class SectionTemplate extends AbstractSerializableBean { public List<Float> getFloatlineLengthsAsList() { String[] parts = floatlineLengths.split("\\/"); - List<Float> newLengths = new ArrayList<Float>(parts.length); + List<Float> newLengths = new ArrayList<>(parts.length); for (String part : parts) { Float aFloat = Float.valueOf(part); newLengths.add(aFloat); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java index dea7d65..10774f4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java @@ -36,7 +36,7 @@ public class SectionWithTemplates { public static List<SectionWithTemplate> getSectionTemplates(Collection<Section> sections) { - List<SectionWithTemplate> sectionTemplates = new ArrayList<SectionWithTemplate>(); + List<SectionWithTemplate> sectionTemplates = new ArrayList<>(); if (sections != null) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java index 6bc39bf..6033e44 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java @@ -35,7 +35,7 @@ public class TripLonglines { public static Set<String> getSetIdsWithTdr(TripLongline tripLongline) { - Set<String> setIds = new HashSet<String>(); + Set<String> setIds = new HashSet<>(); for (ActivityLongline activityLongline : tripLongline.getActivityLongline()) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index 8ea1205..095b8dd 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -66,7 +66,7 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal protected Set<String> getTopiaIds(TopiaSqlSupport topiaSqlSupport, final String tableName) { - final Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<>(); topiaSqlSupport.doSqlWork(new TopiaSqlWork() { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java index ef36c92..fc8c1fc 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java @@ -57,7 +57,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { protected static String getUniqueConstraintName(TopiaSqlSupport tx, final String tableName, final String columnName) { // recherche du nom de la constrainte - final List<String> result = new ArrayList<String>(); + final List<String> result = new ArrayList<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -96,7 +96,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { // recherche du nom de la constrainte //(); - final List<String> result = new ArrayList<String>(); + final List<String> result = new ArrayList<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -131,7 +131,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { public static Set<String> getConstraintNames(TopiaSqlSupport tx, final String tableName) { - final Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -158,7 +158,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { public static Set<String> getForeignKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { - final Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -185,7 +185,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { public static String getForeignKeyConstraintName(TopiaSqlSupport tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { - final List<String> result = new ArrayList<String>(); + final List<String> result = new ArrayList<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -234,7 +234,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration { public static Set<String> getUniqueKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { - final Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<>(); tx.doSqlWork(new TopiaSqlWork() { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java index 2bb4b76..63f6cea 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java @@ -57,7 +57,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { protected static String getUniqueConstraintName(TopiaSqlSupport tx, final String tableName, final String columnName) { // recherche du nom de la constrainte - final List<String> result = new ArrayList<String>(); + final List<String> result = new ArrayList<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -139,7 +139,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { // recherche du nom de la constrainte //(); - final List<String> result = new ArrayList<String>(); + final List<String> result = new ArrayList<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -174,7 +174,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { public static Set<String> getConstraintNames(TopiaSqlSupport tx, final String tableName) { - final Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -201,7 +201,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { public static Set<String> getForeignKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { - final Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -229,7 +229,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { public static String getForeignKeyConstraintName(TopiaSqlSupport tx, final String schemaName, final String tableName, final String columnName, final boolean mustExists) { - final List<String> result = new ArrayList<String>(); + final List<String> result = new ArrayList<>(); tx.doSqlWork(new TopiaSqlWork() { @@ -319,7 +319,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration { public static Set<String> getUniqueKeyConstraintNames(TopiaSqlSupport tx, final String tableName) { - final Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<>(); tx.doSqlWork(new TopiaSqlWork() { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java index fdf5a57..a4d0113 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java @@ -101,7 +101,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration protected Set<SenneData> getSenneData(TopiaSqlSupport tx) { - final Set<SenneData> result = new HashSet<SenneData>(); + final Set<SenneData> result = new HashSet<>(); tx.doSqlWork(new TopiaSqlWork() { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java index 383091e..1391806 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java @@ -91,7 +91,7 @@ public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserv } // L'ensemble des opérations de pêche où l'on doit regénerer les générer les haulingIds - final Set<SetData> setIds = new LinkedHashSet<SetData>(); + final Set<SetData> setIds = new LinkedHashSet<>(); tx.doSqlWork(new TopiaSqlWork() { @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java index 5cb4edb..eb1ce64 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java @@ -57,7 +57,7 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat // recherche du nom de la constrainte - final Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<>(); topiaSqlSupport.doSqlWork(new TopiaSqlWork() { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index c0f902c..9a02b27 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -228,7 +228,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse protected Set<Integer> getIndexId(Connection connection, int oid, int attNum) throws SQLException { - Set<Integer> indexIds = new HashSet<Integer>(); + Set<Integer> indexIds = new HashSet<>(); String sql = "SELECT indexrelid FROM pg_index " + "WHERE indrelid = ? " + diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java index 768e0e7..335a35a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java @@ -241,7 +241,7 @@ public class LengthWeightParameters { public static Map<String, Double> getCoefficientValues(LengthWeightParameter parametrage) { - Map<String, Double> result = new TreeMap<String, Double>(); + Map<String, Double> result = new TreeMap<>(); String coefficients = parametrage.getCoefficients(); if (coefficients != null) { for (String coefficientDef : coefficients.split(":")) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java index 05bfedc..31fa4a4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java @@ -84,7 +84,7 @@ public class LengthWeightParemeterHelper { public static Map<String, Double> getCoefficientValues(LengthWeightParameter parametrage) { - Map<String, Double> result = new TreeMap<String, Double>(); + Map<String, Double> result = new TreeMap<>(); String coefficients = parametrage.getCoefficients(); if (coefficients != null) { for (String coefficientDef : coefficients.split(":")) { @@ -198,7 +198,7 @@ public class LengthWeightParemeterHelper { } public static <P extends LengthWeightParameter> List<P> filterByOcean(List<P> list, Ocean ocean) { - List<P> result = new ArrayList<P>(); + List<P> result = new ArrayList<>(); if (ocean == null) { // on n'accepte que les parametrage sans ocean @@ -218,7 +218,7 @@ public class LengthWeightParemeterHelper { } public static <P extends LengthWeightParameter> List<P> filterBySexe(List<P> list, Sex sex) { - List<P> result = new ArrayList<P>(); + List<P> result = new ArrayList<>(); for (P parametrageLengthWeight : list) { if (parametrageLengthWeight.getSex() == sex) { @@ -229,7 +229,7 @@ public class LengthWeightParemeterHelper { } public static <P extends LengthWeightParameter> List<P> filterByDateDebutValidite(List<P> list, Date startDate) { - List<P> result = new ArrayList<P>(); + List<P> result = new ArrayList<>(); for (P parametrageLengthWeight : list) { @@ -242,7 +242,7 @@ public class LengthWeightParemeterHelper { } public static <P extends LengthWeightParameter> List<P> filterByDateFinValidite(List<P> list, Date endDate) { - List<P> result = new ArrayList<P>(); + List<P> result = new ArrayList<>(); if (endDate == null) { // on n'accepte que les parametrages selon les critères suivants : diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java index 2bd5681..4273546 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java @@ -237,7 +237,7 @@ public class ActivitySeines { } public static List<ActivitySeine> getActivityDebutDePechePositive(Route route) { - List<ActivitySeine> result = new ArrayList<ActivitySeine>(); + List<ActivitySeine> result = new ArrayList<>(); if (!route.isActivitySeineEmpty()) { for (ActivitySeine a : route.getActivitySeine()) { if (a.isActivityDebutDePechePositive()) { @@ -251,7 +251,7 @@ public class ActivitySeines { } public static List<ActivitySeine> getActivityFinDePeche(Route route) { - List<ActivitySeine> result = new ArrayList<ActivitySeine>(); + List<ActivitySeine> result = new ArrayList<>(); if (!route.isActivitySeineEmpty()) { for (ActivitySeine a : route.getActivitySeine()) { if (a.isActivityFinDePeche()) { diff --git a/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java index 057dd74..f4bc0a5 100644 --- a/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java +++ b/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java @@ -55,7 +55,7 @@ public class CollectionFieldExpressionValidator2 extends CollectionFieldExpressi boolean answer = true; Comparator comparator1 = getComparator(); - Set<Object> hashCodes = new TreeSet<Object>(comparator1); + Set<Object> hashCodes = new TreeSet<>(comparator1); int index = -1; for (Object entry : col) { index++; @@ -75,7 +75,7 @@ public class CollectionFieldExpressionValidator2 extends CollectionFieldExpressi private Comparator<?> getComparator() { if (comparator == null) { - comparator = new MyComparator<Object>(keys); + comparator = new MyComparator<>(keys); } return comparator; } diff --git a/observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java index 7871ccc..b12f1d3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java +++ b/observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java @@ -110,7 +110,7 @@ public class ObserveCollectionUniqueKeyValidator extends NuitonFieldValidatorSup boolean answer = true; @SuppressWarnings("unchecked") - Set<Object> hashCodes = new TreeSet<Object>((Comparator<? super Object>) getComparator()); + Set<Object> hashCodes = new TreeSet<>((Comparator<? super Object>) getComparator()); hashCodes.add(object); @@ -157,7 +157,7 @@ public class ObserveCollectionUniqueKeyValidator extends NuitonFieldValidatorSup private Comparator<?> getComparator() { if (comparator == null) { - comparator = new MyComparator<Object>(keys); + comparator = new MyComparator<>(keys); } return comparator; } diff --git a/observe-entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java b/observe-entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java index a4ef0ec..07ad9ca 100644 --- a/observe-entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java +++ b/observe-entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java @@ -113,7 +113,7 @@ public class SectionTemplateTest { SectionTemplate sectionTemplate = new SectionTemplate(); sectionTemplate.setFloatlineLengths("1.1/2.2"); - List<Basket> baskets = new ArrayList<Basket>(); + List<Basket> baskets = new ArrayList<>(); baskets.add(new BasketImpl()); sectionTemplate.applyToBaskets(baskets); @@ -128,7 +128,7 @@ public class SectionTemplateTest { SectionTemplate sectionTemplate = new SectionTemplate(); sectionTemplate.setFloatlineLengths("1.1/2.2/3.3"); - List<Basket> baskets = new ArrayList<Basket>(); + List<Basket> baskets = new ArrayList<>(); baskets.add(new BasketImpl()); baskets.add(new BasketImpl()); @@ -144,7 +144,7 @@ public class SectionTemplateTest { SectionTemplate sectionTemplate = new SectionTemplate(); sectionTemplate.setFloatlineLengths("1.1/2.2/3.3/4.4"); - List<Basket> baskets = new ArrayList<Basket>(); + List<Basket> baskets = new ArrayList<>(); baskets.add(new BasketImpl()); baskets.add(new BasketImpl()); baskets.add(new BasketImpl()); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java index 8fb69de..c196fdd 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java @@ -93,7 +93,7 @@ public class ReportBuilder { log.info("Detected report names : " + reportNames); } - List<Report> reports = new ArrayList<Report>(); + List<Report> reports = new ArrayList<>(); for (String reportName : reportNames) { Report report = build(reportName); reports.add(report); @@ -104,7 +104,7 @@ public class ReportBuilder { protected List<String> detectReportNames() { - List<String> reportNames = new ArrayList<String>(); + List<String> reportNames = new ArrayList<>(); Enumeration<Object> keys = properties.keys(); while (keys.hasMoreElements()) { String key = (String) keys.nextElement(); @@ -177,7 +177,7 @@ public class ReportBuilder { protected Map<String, String> detectReportProperties(String reportName) { - Map<String, String> dico = new TreeMap<String, String>(); + Map<String, String> dico = new TreeMap<>(); // pour chaque report, on récupère ses informations String reportKeyPrefix = "report." + reportName + "."; @@ -199,8 +199,8 @@ public class ReportBuilder { protected ReportRequest[] getRequests(String reportName, Map<String, String> dico) { - Map<Integer, String> requestDico = new TreeMap<Integer, String>(); - Map<Integer, String> requestRepeatDico = new TreeMap<Integer, String>(); + Map<Integer, String> requestDico = new TreeMap<>(); + Map<Integer, String> requestRepeatDico = new TreeMap<>(); Iterator<Map.Entry<String, String>> itr = dico.entrySet().iterator(); while (itr.hasNext()) { Map.Entry<String, String> entry = itr.next(); @@ -236,11 +236,11 @@ public class ReportBuilder { } // On trie les request - List<Integer> ids = new ArrayList<Integer>(requestDico.keySet()); + List<Integer> ids = new ArrayList<>(requestDico.keySet()); Collections.sort(ids); // on construit (dans le bon ordre la liste des requetes) - List<ReportRequest> result = new ArrayList<ReportRequest>(); + List<ReportRequest> result = new ArrayList<>(); for (Integer id : ids) { String requestDef = requestDico.get(id); @@ -296,7 +296,7 @@ public class ReportBuilder { protected ReportOperation[] getOperations(String reportName, Map<String, String> dico) { - Map<Integer, String> requestDico = new TreeMap<Integer, String>(); + Map<Integer, String> requestDico = new TreeMap<>(); Iterator<Map.Entry<String, String>> itr = dico.entrySet().iterator(); while (itr.hasNext()) { Map.Entry<String, String> entry = itr.next(); @@ -316,11 +316,11 @@ public class ReportBuilder { } // On trie les request - List<Integer> ids = new ArrayList<Integer>(requestDico.keySet()); + List<Integer> ids = new ArrayList<>(requestDico.keySet()); Collections.sort(ids); // on construit (dans le bon ordre la liste des requetes) - List<ReportOperation> result = new ArrayList<ReportOperation>(); + List<ReportOperation> result = new ArrayList<>(); for (Integer id : ids) { String operationsDef = requestDico.get(id); @@ -335,9 +335,9 @@ public class ReportBuilder { } protected ReportVariable[] getVariables(String reportName, Map<String, String> dico) { - List<ReportVariable> result = new ArrayList<ReportVariable>(); + List<ReportVariable> result = new ArrayList<>(); Iterator<Map.Entry<String, String>> itr = dico.entrySet().iterator(); - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); while (itr.hasNext()) { Map.Entry<String, String> entry = itr.next(); String key = entry.getKey(); @@ -382,9 +382,9 @@ public class ReportBuilder { } protected ReportVariable[] getRepeatVariables(String reportName, Map<String, String> dico) { - List<ReportVariable> result = new ArrayList<ReportVariable>(); + List<ReportVariable> result = new ArrayList<>(); Iterator<Map.Entry<String, String>> itr = dico.entrySet().iterator(); - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); while (itr.hasNext()) { Map.Entry<String, String> entry = itr.next(); String key = entry.getKey(); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java index b21dfcf..8545218 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java @@ -157,7 +157,7 @@ public class ReportRequest implements Serializable, ObserveDto { // on parcourt la liste de tous les paramètres pour savoir si on doit // les inclure pour la requête donnée : - List<String> namesToUsed = new ArrayList<String>(); + List<String> namesToUsed = new ArrayList<>(); for (String paramName : params.keySet()) { if (request.contains(":" + paramName)) { namesToUsed.add(paramName); diff --git a/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSFileReader.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSFileReader.java index 0d959e6..3e43297 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSFileReader.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSFileReader.java @@ -127,8 +127,8 @@ public class GPSFileReader { if (log.isInfoEnabled()) { log.info("starting... for " + this); } - List<GPSPointInterval> acceptedList = new ArrayList<GPSPointInterval>(); - List<GPSPointInterval> rejectedList = new ArrayList<GPSPointInterval>(); + List<GPSPointInterval> acceptedList = new ArrayList<>(); + List<GPSPointInterval> rejectedList = new ArrayList<>(); GPSPointInterval currentAccepted = null; GPSPointInterval currentRejected = null; GPSPoint previous = null; @@ -160,7 +160,7 @@ public class GPSFileReader { } if (currentAccepted == null) { currentAccepted = new GPSPointIntervalImpl(); - currentAccepted.setPoint(new ArrayList<GPSPoint>()); + currentAccepted.setPoint(new ArrayList<>()); currentAccepted.addPoint(previous); } currentAccepted.addPoint(p); @@ -183,7 +183,7 @@ public class GPSFileReader { if (currentRejected == null) { // nouvelle intervalle de rejet currentRejected = new GPSPointIntervalImpl(); - currentRejected.setPoint(new ArrayList<GPSPoint>()); + currentRejected.setPoint(new ArrayList<>()); currentRejected.addPoint(previous); } currentRejected.addPoint(p); @@ -241,7 +241,7 @@ public class GPSFileReader { */ protected void parseFile(XmlPullParser xpp, GPSRoute model) throws IOException, XmlPullParserException, ParseException { - List<GPSPoint> points = new ArrayList<GPSPoint>(); + List<GPSPoint> points = new ArrayList<>(); GPSPoint previousPoint = null; GPSPoint currentPoint = null; boolean findRoute = false; diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java index 3fd831d..3fc0424 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java @@ -103,7 +103,7 @@ public abstract class AbstractReportServiceRestTest extends AbstractServiceRestT report = service.populateVariables(report, TRIP_SEINE_ID_1); // les variables a utiliser (par defaut, pas de variable) - Map<String, Object> variables = new HashMap<String, Object>(); + Map<String, Object> variables = new HashMap<>(); // preparation des variables prepareVariables(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java index 8f7a423..0b03c28 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java @@ -140,7 +140,7 @@ public class ObserveJdbcHelper extends JdbcHelper { } public List<Pair<String, String>> getTables(Set<String> schemas, Set<String> extraTables) { - List<Pair<String, String>> result = new ArrayList<Pair<String, String>>(); + List<Pair<String, String>> result = new ArrayList<>(); Connection connection = null; ResultSet tables = null; @@ -203,7 +203,7 @@ public class ObserveJdbcHelper extends JdbcHelper { public Set<String> getPostgisFunctions(String functionPattern) { - final Set<String> result = new LinkedHashSet<String>(); + final Set<String> result = new LinkedHashSet<>(); Connection connection = null; PreparedStatement preparedStatement = null; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java index e33c7cc..5c53a62 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java @@ -138,7 +138,7 @@ public class ObserveSecurityHelper { getDataTables(tables, referentielTables); - Set<String> allPostgisFunctions = new LinkedHashSet<String>(); + Set<String> allPostgisFunctions = new LinkedHashSet<>(); for (String postgisFunction : FUNCTION_NAMES_PREFIXS) { Set<String> postgisFunctions = jdbcHelper.getPostgisFunctions(postgisFunction); allPostgisFunctions.addAll(postgisFunctions); @@ -156,7 +156,7 @@ public class ObserveSecurityHelper { // suppression de tous les droits { - Set<String> privateRoles = new HashSet<String>(); + Set<String> privateRoles = new HashSet<>(); privateRoles.add("public"); privateRoles.addAll(referentialEscapedNames); privateRoles.addAll(usersEscapedNames); @@ -219,7 +219,7 @@ public class ObserveSecurityHelper { } protected List<Pair<String, String>> getReferentielTables(Iterable<Pair<String, String>> tables) { - Set<TopiaEntityEnum> types = new HashSet<TopiaEntityEnum>(); + Set<TopiaEntityEnum> types = new HashSet<>(); types.addAll(Arrays.asList(Entities.REFERENCE_ENTITIES)); List<Pair<String, String>> result = getTables(tables, types, EXTRA_TABLES); @@ -236,7 +236,7 @@ public class ObserveSecurityHelper { protected List<Pair<String, String>> getDataTables(Collection<Pair<String, String>> tables, Collection<Pair<String, String>> referentielTables) { - List<Pair<String, String>> result = new ArrayList<Pair<String, String>>(tables); + List<Pair<String, String>> result = new ArrayList<>(tables); result.removeAll(referentielTables); if (log.isInfoEnabled()) { @@ -253,7 +253,7 @@ public class ObserveSecurityHelper { protected List<Pair<String, String>> getTables(Iterable<Pair<String, String>> tables, Set<TopiaEntityEnum> types, Set<String> extraTypes) { - List<Pair<String, String>> result = new ArrayList<Pair<String, String>>(); + List<Pair<String, String>> result = new ArrayList<>(); for (Pair<String, String> t : tables) { String table = t.getRight(); String detectedType = null; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java index 7deaa3a..d9551b4 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java @@ -105,7 +105,7 @@ public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopi report = service.populateVariables(report, ObserveFixtures.TRIP_SEINE_ID_1); // les variables a utiliser (par defaut, pas de variable) - Map<String, Object> variables = new HashMap<String, Object>(); + Map<String, Object> variables = new HashMap<>(); // preparation des variables prepareVariables(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit f656749490eddc5fab7d36de07e55bb31802e0ec Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 6 13:51:09 2016 +0100 Suppression méthodes non utilisées --- .../services/dto/referential/ReferentialDtos.java | 98 ---------------------- 1 file changed, 98 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java index 502a2c6..972e0dc 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java @@ -1,8 +1,6 @@ package fr.ird.observe.services.dto.referential; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -44,11 +42,6 @@ import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Iterator; -import java.util.List; public class ReferentialDtos extends AbstractReferentialDtos { @@ -123,95 +116,4 @@ public class ReferentialDtos extends AbstractReferentialDtos { .addAll(REFERENCE_LONGLINE_DTOS) .build(); - /** - * Logger. - */ - private static final Log log = LogFactory.getLog(ReferentialDtos.class); - - /** - * Filter une liste d'entités d'un référentiel en supprimmant toutes les - * entités qui ne sont pas actives {@link ReferentialDto#getStatus()} - * - * @param list la liste des entitées à filtrer - * @param <E> le type des entites du référentiel - */ - public static <E extends ReferentialDto> void filterReferentialListByStatus(List<E> list) { - filterReferentielList(list, (Predicate<E>) IS_ACTIF_PREDICATE); - } - - public static <E extends ReferentialDto> void filterReferentialReferenceListByStatus(List<ReferentialReference<E>> list) { - filterReferentialReferenceList(list, IS_REFERENCE_ACTIF_PREDICATE); - } - - /** - * Filter une liste d'entités d'un référentiel en supprimant toutes les - * entités qui ne rspeciesnt pas le précidat donné. - * - * @param list la liste des entitées à filtrer - * @param predicate le prédicate à appliquer pour conserver les valeurs - * @param <E> le type des entites du référentiel - */ - public static <E extends ReferentialDto> void filterReferentielList( - List<E> list, - Predicate<E> predicate) { - Iterator<E> itr = list.iterator(); - while (itr.hasNext()) { - E e = itr.next(); - if (!predicate.apply(e)) { - - // l'entite n'est pas retenue, on ne l'affiche pas - - if (log.isDebugEnabled()) { - log.debug("remove disabled entity " + e.getId()); - } - - itr.remove(); - } - } - } - - /** - * Filter une liste d'entités d'un référentiel en supprimant toutes les - * entités qui ne rspeciesnt pas le précidat donné. - * - * @param list la liste des entitées à filtrer - * @param predicate le prédicate à appliquer pour conserver les valeurs - * @param <E> le type des entites du référentiel - */ - public static <E extends ReferentialDto> void filterReferentialReferenceList( - List<ReferentialReference<E>> list, - Predicate<ReferentialReference> predicate) { - Iterator<ReferentialReference<E>> itr = list.iterator(); - while (itr.hasNext()) { - ReferentialReference<E> e = itr.next(); - if (!predicate.apply(e)) { - - // l'entite n'est pas retenue, on ne l'affiche pas - - if (log.isDebugEnabled()) { - log.debug("remove disabled entity " + e.getId()); - } - - itr.remove(); - } - } - } - - public static final Predicate<ReferentialDto> IS_ACTIF_PREDICATE = new Predicate<ReferentialDto>() { - - @Override - public boolean apply(ReferentialDto input) { - return ReferenceStatus.disabled != input.getStatus(); - } - }; - - public static final Predicate<ReferentialReference> IS_REFERENCE_ACTIF_PREDICATE = - new Predicate<ReferentialReference>() { - - @Override - public boolean apply(ReferentialReference input) { - return input.isEnabled(); - } - }; - } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.