August 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Problème d'UI lors de l'enregistrement d'un profil de connexion direct (See #837)
by Tony CHEMIT 12 Aug '17

12 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c56da7cf by Tony CHEMIT at 2017-08-12T14:27:52+02:00 Problème d'UI lors de l'enregistrement d'un profil de connexion direct (See #837) - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUI.jcss @@ -25,6 +25,7 @@ JMenuBar { borderPainted:false; margin:{new Insets(0, 0, 0, 0)}; border: {null}; + minimumSize:{new Dimension(100,30)}; } JMenu { ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java @@ -68,8 +68,8 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI /** Logger */ private static final Log log = LogFactory.getLog(ConfigUIHandler.class); - public static final String ACTION_DO_CHOOSE_FILE = "doChooseFile"; - public static final String ACTION_DO_USE_SSL = "doUseSsl"; + private static final String ACTION_DO_CHOOSE_FILE = "doChooseFile"; + private static final String ACTION_DO_USE_SSL = "doUseSsl"; private ObserveActionMap observeActionMap; @Override @@ -160,7 +160,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI ui.getServerMenu().add(item); } - public void refreshConfig(ConfigUI ui, String configId) { + private void refreshConfig(ConfigUI ui, String configId) { JComponent c = (JComponent) ui.getObjectById(configId); if (c != null) { if (log.isDebugEnabled()) { @@ -182,21 +182,21 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } - public Icon updateConnexionStatutIcon(ConnexionStatus status) { + Icon updateConnexionStatutIcon(ConnexionStatus status) { return (Icon) ui.getConnexionStatus().getClientProperty(status.name().toLowerCase() + "Icon"); } - public Color updateConnexionStatutColor(ConnexionStatus status) { + Color updateConnexionStatutColor(ConnexionStatus status) { return (Color) ui.getConnexionStatus().getClientProperty(status.name().toLowerCase() + "Color"); } - public String updateConnexionStatutText(@SuppressWarnings("unused") ConnexionStatus status) { + String updateConnexionStatutText(@SuppressWarnings("unused") ConnexionStatus status) { ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); ObserveTextGenerator textGenerator = applicationContext.getTextGenerator(); return textGenerator.getConnexionTestResultMessage(ui.getModel()); } - public void chooseDumpFile() { + void chooseDumpFile() { File f = UIHelper.chooseFile(ui, t("observe.title.choose.db.dump"), t("observe.action.choose.db.dump"), View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c56da7cfa82d88175e61f060054… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c56da7cfa82d88175e61f060054… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Quelques améliorations sur l'abre de sélection (See #839)
by Tony CHEMIT 12 Aug '17

12 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc75a523 by Tony CHEMIT at 2017-08-12T13:43:42+02:00 Quelques améliorations sur l'abre de sélection (See #839) - - - - - 5 changed files: - client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java - client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java - client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeHeaderHandler.java - client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeModel.java - client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java @@ -28,7 +28,7 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.ActionMap; import javax.swing.InputMap; -import javax.swing.ListSelectionModel; +import javax.swing.tree.TreeSelectionModel; import org.jdesktop.swingx.JXTree; /** @@ -45,7 +45,7 @@ public class SelectionTree extends JXTree { setCellRenderer(new SelectionTreeCellRenderer()); setRootVisible(false); setRowHeight(30); - getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); } @@ -76,16 +76,6 @@ public class SelectionTree extends JXTree { inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { - protected void forTree(SelectionTree tree) { - Object selectedRow = tree.getLastSelectedPathComponent(); - if (selectedRow == null) { - return; - } - - SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow; - tree.getTreeModel().setValueAt(node, !node.isSelected()); - } - @Override public void actionPerformed(ActionEvent e) { if (isFocusOwner()) { @@ -94,6 +84,16 @@ public class SelectionTree extends JXTree { forTree(oppositeTree); } } + + private void forTree(SelectionTree tree) { + Object selectedRow = tree.getLastSelectedPathComponent(); + if (selectedRow == null) { + return; + } + + SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow; + tree.getTreeModel().setValueAt(node, !node.isSelected()); + } }); } ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java @@ -44,7 +44,7 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { private final JPanel panel; private final JCheckBox selected; - public SelectionTreeCellRenderer() { + protected SelectionTreeCellRenderer() { selected = new JCheckBox(); panel = new JPanel(new BorderLayout(2, 2)); panel.setOpaque(false); ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeHeaderHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeHeaderHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeHeaderHandler.java @@ -46,15 +46,15 @@ public class SelectionTreeHeaderHandler implements UIHandler<SelectionTreeHeader } @Override - public void beforeInit(SelectionTreeHeader selectionTreeHeader) { - this.ui = selectionTreeHeader; + public void beforeInit(SelectionTreeHeader ui) { + this.ui = ui; } @Override - public void afterInit(SelectionTreeHeader selectionTreeHeader) { + public void afterInit(SelectionTreeHeader ui) { PropertyChangeListener propertyChangeListener = e -> onTripCountChanged((int) e.getNewValue()); - selectionTreeHeader.addPropertyChangeListener(SelectionTreeHeader.PROPERTY_TREE_TABLE, e -> { + ui.addPropertyChangeListener(SelectionTreeHeader.PROPERTY_TREE_TABLE, e -> { SelectionTreeModel newValue = ((SelectionTree) e.getNewValue()).getTreeModel(); newValue.removePropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, propertyChangeListener); newValue.addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, propertyChangeListener); ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeModel.java @@ -108,10 +108,10 @@ public class SelectionTreeModel extends DefaultTreeModel { public void setSelectedCount(int selectedCount) { int oldValue = getSelectedCount(); - boolean oldSelectionempty = isSelectionEmpty(); + boolean oldSelectionEmpty = isSelectionEmpty(); this.selectedCount = selectedCount; pcs.firePropertyChange(SELECTED_COUNT, oldValue, selectedCount); - pcs.firePropertyChange(SELECTION_EMPTY, oldSelectionempty, isSelectionEmpty()); + pcs.firePropertyChange(SELECTION_EMPTY, oldSelectionEmpty, isSelectionEmpty()); } public boolean isSelectionEmpty() { @@ -228,10 +228,12 @@ public class SelectionTreeModel extends DefaultTreeModel { public ImmutableSet<Class<? extends ReferentialDto>> getSelectedReferentiel() { ImmutableSet.Builder<Class<? extends ReferentialDto>> builder = ImmutableSet.builder(); - for (ReferentialsSelectionTreeNode programNode : getRoot().getReferentialsNodes()) { - ImmutableList<Class<? extends ReferentialDto>> selected = programNode.getSelected(); - if (!selected.isEmpty()) { - builder.addAll(selected); + if (isLoadReferential()) { + for (ReferentialsSelectionTreeNode programNode : getRoot().getReferentialsNodes()) { + ImmutableList<Class<? extends ReferentialDto>> selected = programNode.getSelected(); + if (!selected.isEmpty()) { + builder.addAll(selected); + } } } return builder.build(); ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java @@ -59,6 +59,7 @@ public class RootSelectionTreeNode extends SelectionTreeNodeSupport<Void> implem @Override public Iterator<ProgramSelectionTreeNode> iterator() { + //noinspection unchecked return (Iterator) EnumerationUtils.toList(children()).stream().filter(c -> c instanceof ProgramSelectionTreeNode).iterator(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dc75a523a457977019ba8da4795… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dc75a523a457977019ba8da4795… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Problème de validation sur captures cibles conservées (See #843)
by Tony CHEMIT 12 Aug '17

12 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e0fda8cd by Tony CHEMIT at 2017-08-12T13:14:43+02:00 [PS] Problème de validation sur captures cibles conservées (See #843) - - - - - 1 changed file: - validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-update-targetCatch-error-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-update-targetCatch-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-update-targetCatch-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetCatchDto-update-targetCatch-error-validation.xml @@ -63,7 +63,7 @@ <field name="well">  - <field-validator type="required" short-circuit="true"> + <field-validator type="requiredstring" short-circuit="true"> <message>observe.validation.targetCatch.required.well</message> </field-validator> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e0fda8cd4cc11e8682979b3eae6… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e0fda8cd4cc11e8682979b3eae6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] La synchro avancée de référentiel ne fonctionne plus (See #841)
by Tony CHEMIT 12 Aug '17

12 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 900f2741 by Tony CHEMIT at 2017-08-12T13:06:16+02:00 La synchro avancée de référentiel ne fonctionne plus (See #841) L'assistant sauver la base (central vers local) plante (See #840) Continue to clean services api (but there is still some work to do on it...) - - - - - 17 changed files: - pom.xml - server/src/main/filtered-resources/mapping - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - − services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java - services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java - − services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java - services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java - services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java - services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> <nuitonConverterVersion>1.0</nuitonConverterVersion> <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> - <httpVersion>1.0.2</httpVersion> + <httpVersion>1.0.3-SNAPSHOT</httpVersion> <xworkVersion>2.3.33</xworkVersion> <flexmarkVersion>0.22.18</flexmarkVersion> <hibernateVersion>5.1.9.Final</hibernateVersion> ===================================== server/src/main/filtered-resources/mapping ===================================== --- a/server/src/main/filtered-resources/mapping +++ b/server/src/main/filtered-resources/mapping @@ -72,8 +72,8 @@ GET /api/v1/actions/consolidate/ConsolidateDataService/newSimplifiedObjectTyp POST /api/v1/actions/report/ReportService/executeReport v1.actions.report.ReportServiceRestApi.executeReport POST /api/v1/actions/report/ReportService/populateVariables v1.actions.report.ReportServiceRestApi.populateVariables GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getEnabledReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getEnabledReferentialReferenceSet +POST /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getReferential v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getReferential GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getReferentialReferenceSet -POST /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getReferentials v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getReferentials GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getSourceReferentialStates v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getSourceReferentialStates POST /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/applySqlRequests v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceRestApi.applySqlRequests GET /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/filterIdsUsedInLocalSource v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceRestApi.filterIdsUsedInLocalSource ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java @@ -33,7 +33,6 @@ import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialMultimap; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceStates; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; @@ -50,7 +49,8 @@ import org.nuiton.util.TimeLog; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -public class ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia implements ReferentialSynchronizeDiffService { +public class +ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia implements ReferentialSynchronizeDiffService { /** Logger. */ private static final Log log = LogFactory.getLog(ReferentialSynchronizeDiffServiceTopia.class); @@ -65,7 +65,6 @@ public class ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia } Class<? extends ObserveReferentialEntity> entityType = BinderEngine.get().getReferentialEntityType(referentialName); - ObserveEntityEnum entityEnum = ObserveEntityEnum.valueOf(entityType); return getEnabledReferenceSet0(entityType, referentialName); } @@ -76,23 +75,22 @@ public class ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia log.trace("getReferentialReferenceSet(" + referentialName + ", " + ids.size() + " element(s)"); } Class<? extends ObserveReferentialEntity> entityType = BinderEngine.get().getReferentialEntityType(referentialName); - ObserveEntityEnum entityEnum = ObserveEntityEnum.valueOf(entityType); return getReferenceSet0(entityType, referentialName, ids); } @Override - public <R extends ReferentialDto> ReferentialMultimap<R> getReferentials(Class<R> referentialName, ImmutableSet<String> ids) { + public <R extends ReferentialDto> ImmutableSet<R> getReferential(Class<R> referentialName, ImmutableSet<String> ids) { Class<? extends ObserveReferentialEntity> entityType = BinderEngine.get().getReferentialEntityType(referentialName); - return getReferentials0(referentialName, entityType, ids); + return getReferential0(referentialName, entityType, ids); } - private <E extends ObserveReferentialEntity, R extends ReferentialDto> ReferentialMultimap<R> getReferentials0(Class<R> dtoType, Class<E> entityType, ImmutableSet<String> ids) { - ReferentialMultimap.Builder<R> result = ReferentialMultimap.builder(); + private <E extends ObserveReferentialEntity, R extends ReferentialDto> ImmutableSet<R> getReferential0(Class<R> dtoType, Class<E> entityType, ImmutableSet<String> ids) { + ImmutableSet.Builder<R> result = ImmutableSet.builder(); ReferentialLocale referentialLocale = getReferentialLocale(); List<E> entities = loadEntities(entityType, ids); for (E entity : entities) { ReferentialBinderSupport<ObserveReferentialEntity, R> binder = BinderEngine.get().getReferentialBinder(dtoType); - result.put(dtoType, binder.toDto(referentialLocale, entity)); + result.add(binder.toDto(referentialLocale, entity)); } return result.build(); @@ -110,8 +108,9 @@ public class ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia if (ObserveEntityEnum.LastUpdateDate.equals(referenceEntity)) { continue; } - Class entityType = referenceEntity.getContract(); - Class dtoType = BinderEngine.get().getReferentialDtoType(entityType); + //noinspection unchecked + Class<? extends ObserveReferentialEntity> entityType = (Class) referenceEntity.getContract(); + Class<? extends ReferentialDto> dtoType = BinderEngine.get().getReferentialDtoType(entityType); getLocalSourceReferentialVersions0(dtoType, entityType, referentialStates); } return referentialStates; ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -29,6 +29,7 @@ import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.OceanDto; @@ -96,7 +97,7 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser } @Override - public <R extends ReferentialDto> ImmutableSet<ReferentialReference<R>> getLocalSourceReferentialToDelete(Class<R> referentialName, ImmutableSet<String> ids) { + public <R extends ReferentialDto> ReferentialReferenceSet<R> getLocalSourceReferentialToDelete(Class<R> referentialName, ImmutableSet<String> ids) { Class<? extends ObserveReferentialEntity> entityType = BinderEngine.get().getReferentialEntityType(referentialName); return getLocalSourceReferentialToDelete0(entityType, referentialName, ids); @@ -126,7 +127,8 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser if (ObjectMaterialDto.class.equals(dtoType)) { // must reorder to be sure to insert parent before sons - referentialToAdd = (ImmutableSet) ObjectMaterialHelper.reorder((ImmutableSet) referentialToAdd); + //noinspection unchecked + referentialToAdd = ObjectMaterialHelper.reorder((ImmutableSet) referentialToAdd); } for (R referentialDto : referentialToAdd) { @@ -223,17 +225,17 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser } - private <E extends ObserveReferentialEntity, R extends ReferentialDto> ImmutableSet<ReferentialReference<R>> getLocalSourceReferentialToDelete0(Class<E> entityType, Class<R> dtoType, ImmutableSet<String> ids) { + private <E extends ObserveReferentialEntity, R extends ReferentialDto> ReferentialReferenceSet<R> getLocalSourceReferentialToDelete0(Class<E> entityType, Class<R> dtoType, ImmutableSet<String> ids) { TopiaDao<E> dao = getTopiaPersistenceContext().getDao(entityType); List<E> entities = dao.forTopiaIdIn(ids).findAll(); ReferentialBinderSupport<E, R> referentialBinder = BinderEngine.get().getReferentialBinder(dtoType); - Set<ReferentialReference<R>> result = new LinkedHashSet<>(); + ImmutableSet.Builder<ReferentialReference<R>> result = ImmutableSet.builder(); for (E entity : entities) { ReferentialReference<R> rReferentialReference = referentialBinder.toReferentialReference(getReferentialLocale(), entity); result.add(rReferentialReference); } - return ImmutableSet.copyOf(result); + return ReferentialReferenceSet.of(dtoType, result.build(), null); } ===================================== services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java deleted ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java +++ /dev/null @@ -1,178 +0,0 @@ -package fr.ird.observe.services.dto.referential; - -/* - * #%L - * ObServe :: Services - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSetMultimap; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multiset; -import java.util.Collection; -import java.util.Objects; - -/** - * @author smaisonneuve - * Created on 17/08/16. - */ -public class ReferentialMultimap<K extends ReferentialDto> { - - private ImmutableSetMultimap<Class<K>, K> immutableSetMultimap; - - public static <K extends ReferentialDto, V> ReferentialMultimap<K> of() { - return new ReferentialMultimap<>(); - } - - public static <K extends ReferentialDto> ReferentialMultimap<K> of(Class<K> k1, K v1) { - return new ReferentialMultimap<>(k1, v1); - } - - public static <K extends ReferentialDto> ReferentialMultimap<K> copyOf(Multimap<Class<K>, K> multimap) { - return new ReferentialMultimap<>(multimap); - } - - public static <K extends ReferentialDto> Builder<K> builder() { - return new Builder<>(); - } - - public static class Builder<K extends ReferentialDto> { - private final ImmutableSetMultimap.Builder<Class<K>, K> builder = ImmutableSetMultimap.builder(); - - public Builder<K> add(K referentialDto) { - Objects.requireNonNull(referentialDto, "Can't add a null object in ReferentialMultimap"); - builder.put((Class) referentialDto.getClass(), referentialDto); - return this; - } - - public Builder put(Class<K> dtoType, K referentialDto) { - builder.putAll(dtoType, referentialDto); - return this; - } - - public Builder putAll(Class<K> dtoType, Collection<K> values) { - builder.putAll(dtoType, values); - return this; - } - - public ReferentialMultimap<K> build() { - return copyOf(builder.build()); - } - } - - private ReferentialMultimap() { - immutableSetMultimap = ImmutableSetMultimap.<Class<K>, K>builder().build(); - } - - private ReferentialMultimap(Class<K> k1, K v1) { - immutableSetMultimap = ImmutableSetMultimap.of(k1, v1); - } - - private ReferentialMultimap(Multimap<Class<K>, K> multimap) { - immutableSetMultimap = ImmutableSetMultimap.copyOf(multimap); - } - - public ImmutableSet<K> get(Class<K> key) { - return immutableSetMultimap.get(key); - } - - // @Override -// public ImmutableSet<Class<K>> keySet() { -// return immutableSetMultimap.keySet(); -// } -// - public Multiset<Class<K>> keys() { - return immutableSetMultimap.keys(); - } - - // @Override -// public Collection<K> values() { -// return immutableSetMultimap.values(); -// } -// -// @Override -// public ImmutableSet<K> removeAll(Object key) { -// return immutableSetMultimap.removeAll(key); -// } -// -// @Override -// public void clear() { -// immutableSetMultimap.clear(); -// } -// - public int size() { - return immutableSetMultimap.size(); - } - - public boolean isEmpty() { - return immutableSetMultimap.isEmpty(); - } - - // -// @Override -// public boolean containsKey(Object key) { -// return immutableSetMultimap.containsKey(key); -// } -// -// @Override -// public boolean containsValue(Object value) { -// return immutableSetMultimap.containsValue(value); -// } -// -// @Override -// public boolean containsEntry(Object key, Object value) { -// return immutableSetMultimap.containsEntry(key, value); -// } -// -// @Override -// public boolean put(Class<K> key, K value) { -// return immutableSetMultimap.put(key, value); -// } -// -// @Override -// public boolean remove(Object key, Object value) { -// return immutableSetMultimap.remove(key, value); -// } -// -// @Override -// public boolean putAll(Class<K> key, Iterable<? extends K> values) { -// return immutableSetMultimap.putAll(key, values); -// } -// -// @Override -// public boolean putAll(Multimap<? extends Class<K>, ? extends K> multimap) { -// return immutableSetMultimap.putAll(multimap); -// } -// -// @Override -// public ImmutableSet<K> replaceValues(Class<K> key, Iterable<? extends K> values) { -// return immutableSetMultimap.replaceValues(key, values); -// } -// -// @Override -// public ImmutableSet<Map.Entry<Class<K>, K>> entries() { -// return immutableSetMultimap.entries(); -// } -// - public ImmutableMap<Class<K>, Collection<K>> asMap() { - return immutableSetMultimap.asMap(); - } -} ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java @@ -40,7 +40,6 @@ import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; -import fr.ird.observe.services.dto.referential.ReferentialMultimap; import fr.ird.observe.services.gson.reference.DataReferenceAdapter; import fr.ird.observe.services.gson.reference.DataReferenceListAdapter; import fr.ird.observe.services.gson.reference.DataReferenceSetAdapter; @@ -58,20 +57,17 @@ import java.util.function.Supplier; import org.nuiton.version.Version; /** - * @author Arnaud Thimel - thimel(a)codelutin.com * @author Tony Chemit - dev(a)tchemit.fr */ public class ObserveDtoGsonSupplier implements Supplier<Gson> { - public static final Supplier<Gson> DEFAULT_GSON_SUPPLIER = () -> new ObserveDtoGsonSupplier().get(); + private final boolean prettyPrint; - protected final boolean prettyPrint; + private GsonBuilder gsonBuilder; - protected GsonBuilder gsonBuilder; + private Gson gson; - protected Gson gson; - - public ObserveDtoGsonSupplier() { + protected ObserveDtoGsonSupplier() { this(false); } @@ -79,7 +75,7 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { this.prettyPrint = prettyPrint; } - public static <K, V> TypeToken<Map<K, V>> mapOf(TypeToken<K> keyType, TypeToken<V> valueType) { + static <K, V> TypeToken<Map<K, V>> mapOf(TypeToken<K> keyType, TypeToken<V> valueType) { return new TypeToken<Map<K, V>>() { } .where(new TypeParameter<K>() { @@ -88,7 +84,7 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { }, valueType); } - public static <K, V> TypeToken<Map<K, Collection<V>>> multimapOf(TypeToken<K> keyType, TypeToken<V> valueType) { + static <K, V> TypeToken<Map<K, Collection<V>>> multimapOf(TypeToken<K> keyType, TypeToken<V> valueType) { return new TypeToken<Map<K, Collection<V>>>() { } .where(new TypeParameter<K>() { @@ -131,7 +127,6 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { gsonBuilder.registerTypeAdapter(ImmutableMultimap.class, new ImmutableMultimapAdapter()); gsonBuilder.registerTypeAdapter(SetMultimap.class, new SetMultimapAdapter()); gsonBuilder.registerTypeAdapter(ArrayListMultimap.class, new ArrayListMultimapAdapter()); - gsonBuilder.registerTypeAdapter(ReferentialMultimap.class, new ReferentialMultimapAdapter()); gsonBuilder.registerTypeAdapter(ObserveBlobsContainer.class, new ObserveBlobsContainerAdapter()); ===================================== services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java deleted ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java +++ /dev/null @@ -1,83 +0,0 @@ -package fr.ird.observe.services.gson; - -/* - * #%L - * ObServe :: Services - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.reflect.TypeParameter; -import com.google.common.reflect.TypeToken; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import java.lang.reflect.Type; -import java.util.Collection; -import java.util.Map; -import java.util.Set; - -/** - * @author Samuel Maisonneuve - maisonneuve(a)codelutin.com - */ -public class ReferentialMultimapAdapter implements JsonSerializer<ReferentialMultimap>, JsonDeserializer<ReferentialMultimap> { - - - @Override - public JsonElement serialize(ReferentialMultimap src, Type typeOfSrc, JsonSerializationContext context) { - return context.serialize(src.asMap()); - } - - @Override - public ReferentialMultimap deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException { - - ReferentialMultimap.Builder builder = ReferentialMultimap.builder(); - - Set<Map.Entry<String, JsonElement>> entries = json.getAsJsonObject().entrySet(); - for (Map.Entry<String, JsonElement> entry : entries) { - String keyEntry = entry.getKey(); - JsonObject keyObject = new JsonObject(); - keyObject.addProperty("key", keyEntry); - - // Deserialize the key - Class key = context.deserialize(keyObject.getAsJsonPrimitive("key"), Class.class); - - // Deserialize the collection associated to the key - Type typeToken = collectionOf(key).getType(); - Collection values = context.deserialize(entry.getValue(), typeToken); - - // Add the key/values to the multimap - builder.putAll(key, values); - } - - return builder.build(); - - } - - static <E> TypeToken<Collection<E>> collectionOf(Class<E> subType) { - return new TypeToken<Collection<E>>() { - } - .where(new TypeParameter<E>() { - }, subType); - } -} ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.diff; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.LinkedHashMap; import java.util.Map; @@ -33,7 +34,7 @@ import java.util.Map; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -public class ReferentialDataSourceStates { +public class ReferentialDataSourceStates implements ObserveDto { /** * Contient pour chaque type de référentiel la version de chaque référentiel indexé par son nom. @@ -48,7 +49,8 @@ public class ReferentialDataSourceStates { * @param referentialName le nom de référentiel * @return la collection des versions de référentiel du nom demandé. */ - public <R extends ReferentialDto> ReferentialDataSourceState<R> getReferentialVersions(Class<R> referentialName) { + <R extends ReferentialDto> ReferentialDataSourceState<R> getReferentialVersions(Class<R> referentialName) { + //noinspection unchecked return diffStatesByType.get(referentialName); } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java @@ -25,7 +25,6 @@ package fr.ird.observe.services.service.actions.synchro.referential.diff; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialMultimap; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.spi.ReadReferentialPermission; import io.ultreia.java4all.http.spi.Get; @@ -47,9 +46,10 @@ public interface ReferentialSynchronizeDiffService extends ObserveService { @ReadReferentialPermission <R extends ReferentialDto> ReferentialReferenceSet<R> getReferentialReferenceSet(Class<R> referentialName, ImmutableSet<String> ids); + //FIXME On doit juste retourner un ReferentialReferenceSet, le dictionnaire ne sert à rien (tous les résultats doivent être du même type...) @Post @ReadReferentialPermission - <R extends ReferentialDto> ReferentialMultimap<R> getReferentials(Class<R> referentialName, ImmutableSet<String> ids); + <R extends ReferentialDto> ImmutableSet<R> getReferential(Class<R> referentialName, ImmutableSet<String> ids); /** * Récupération sur la source à synchroniser des versions de ses référentiels. ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialMultimap; import java.util.Set; import java.util.stream.Collectors; @@ -60,6 +59,7 @@ public class ReferentialSynchronizeDiffsEngine { for (Class referentialType : allReferentialTypes) { + //noinspection unchecked build0(referentialType, result, leftSourceReferentialStates.getReferentialVersions(referentialType), rightSourceReferentialStates.getReferentialVersions(referentialType)); } @@ -76,16 +76,14 @@ public class ReferentialSynchronizeDiffsEngine { return rightDiffService.getReferentialReferenceSet(referentialName, ImmutableSet.copyOf(ids)); } - public <R extends ReferentialDto> ImmutableSet<R> getLeftReferentials(Class<R> referentialName, ImmutableSet<ReferentialSynchronizeDiffState> diffStates) { + public <R extends ReferentialDto> ImmutableSet<R> getLeftReferential(Class<R> referentialName, ImmutableSet<ReferentialSynchronizeDiffState> diffStates) { Set<String> ids = diffStates.stream().map(ReferentialSynchronizeDiffState::getId).collect(Collectors.toSet()); - ReferentialMultimap<R> referentials = leftDiffService.getReferentials(referentialName, ImmutableSet.copyOf(ids)); - return referentials.get(referentialName); + return leftDiffService.getReferential(referentialName, ImmutableSet.copyOf(ids)); } - public <R extends ReferentialDto> ImmutableSet<R> getRightReferentials(Class<R> referentialName, ImmutableSet<ReferentialSynchronizeDiffState> diffStates) { + public <R extends ReferentialDto> ImmutableSet<R> getRightReferential(Class<R> referentialName, ImmutableSet<ReferentialSynchronizeDiffState> diffStates) { Set<String> ids = diffStates.stream().map(ReferentialSynchronizeDiffState::getId).collect(Collectors.toSet()); - ReferentialMultimap<R> referentials = rightDiffService.getReferentials(referentialName, ImmutableSet.copyOf(ids)); - return referentials.get(referentialName); + return rightDiffService.getReferential(referentialName, ImmutableSet.copyOf(ids)); } public <R extends ReferentialDto> ReferentialReferenceSet<R> getLeftEnabledReferentialReferenceSet(Class<R> referentialName) { ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeContext.java @@ -37,13 +37,13 @@ public class UnidirectionalReferentialSynchronizeContext { private final UnidirectionalReferentialSynchronizeCallbackRequests callbackRequests; private Set<String> sqlRequests; - public UnidirectionalReferentialSynchronizeContext(ImmutableSet<UnidirectionalReferentialSynchronizeRequest.Builder<?>> referentialSynchronizeRequestBuilders, UnidirectionalReferentialSynchronizeCallbackRequests callbackRequests) { + UnidirectionalReferentialSynchronizeContext(ImmutableSet<UnidirectionalReferentialSynchronizeRequest.Builder<?>> referentialSynchronizeRequestBuilders, UnidirectionalReferentialSynchronizeCallbackRequests callbackRequests) { this.referentialSynchronizeRequestBuilders = referentialSynchronizeRequestBuilders; this.callbackRequests = callbackRequests; } - public ImmutableSet<UnidirectionalReferentialSynchronizeRequest.Builder<?>> getReferentialSynchronizeRequestBuilders() { + ImmutableSet<UnidirectionalReferentialSynchronizeRequest.Builder<?>> getReferentialSynchronizeRequestBuilders() { return referentialSynchronizeRequestBuilders; } @@ -55,11 +55,11 @@ public class UnidirectionalReferentialSynchronizeContext { return callbackRequests.isNotEmpty(); } - public void setSqlRequests(Set<String> sqlRequests) { + void setSqlRequests(Set<String> sqlRequests) { this.sqlRequests = sqlRequests; } - public Set<String> getSqlRequests() { + Set<String> getSqlRequests() { return sqlRequests; } } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java @@ -116,8 +116,8 @@ public class UnidirectionalReferentialSynchronizeEngine { result.flushRequest(referentialSynchronizeRequest); - Set<String> sqlRequestsforReferential = localService.generateSqlRequests(referentialSynchronizeRequest); - for (String sqlStatement : sqlRequestsforReferential) { + Set<String> generatedSqlRequests = localService.generateSqlRequests(referentialSynchronizeRequest); + for (String sqlStatement : generatedSqlRequests) { if (sqlStatement.startsWith("INSERT")) { insertSqlRequests.add(sqlStatement); @@ -160,7 +160,7 @@ public class UnidirectionalReferentialSynchronizeEngine { if (optionalAddDiffStates.isPresent()) { ImmutableSet<ReferentialSynchronizeDiffState> referentialSynchronizeDiffStates = optionalAddDiffStates.get(); - ImmutableSet<R> referentials = diffsEngine.getRightReferentials(referentialName, referentialSynchronizeDiffStates); + ImmutableSet<R> referentials = diffsEngine.getRightReferential(referentialName, referentialSynchronizeDiffStates); referentials.forEach(builder::entityToAdd); } @@ -169,7 +169,7 @@ public class UnidirectionalReferentialSynchronizeEngine { if (optionalUpdateDiffStates.isPresent()) { ImmutableSet<ReferentialSynchronizeDiffState> referentialSynchronizeDiffStates = optionalUpdateDiffStates.get(); - ImmutableSet<R> referentials = diffsEngine.getRightReferentials(referentialName, referentialSynchronizeDiffStates); + ImmutableSet<R> referentials = diffsEngine.getRightReferential(referentialName, referentialSynchronizeDiffStates); referentials.forEach(builder::entityToUpdate); } @@ -203,9 +203,9 @@ public class UnidirectionalReferentialSynchronizeEngine { ReferentialReferenceSet<R> availableReferenceSet = diffsEngine.getRightEnabledReferentialReferenceSet(referentialName); Set<ReferentialReference<R>> availableReferentials = availableReferenceSet.getReferences(); - Set<ReferentialReference<R>> blockingReferentialsToRemove = localService.getLocalSourceReferentialToDelete(referentialName, ImmutableSet.copyOf(blockingIdsToRemove)); + ReferentialReferenceSet<R> blockingReferentialsToRemove = localService.getLocalSourceReferentialToDelete(referentialName, ImmutableSet.copyOf(blockingIdsToRemove)); - callbackRequests.addCallbackRequest(referentialName, blockingReferentialsToRemove, availableReferentials); + callbackRequests.addCallbackRequest(referentialName, blockingReferentialsToRemove.getReferences(), availableReferentials); } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.spi.ReadReferentialPermission; @@ -64,7 +64,7 @@ public interface UnidirectionalReferentialSynchronizeLocalService extends Observ */ @ReadReferentialPermission @Get - <R extends ReferentialDto> ImmutableSet<ReferentialReference<R>> getLocalSourceReferentialToDelete(Class<R> referentialName, ImmutableSet<String> ids); + <R extends ReferentialDto> ReferentialReferenceSet<R> getLocalSourceReferentialToDelete(Class<R> referentialName, ImmutableSet<String> ids); /** * Pour produire le code sql à partir de la demande pour un référentiel donné. ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java @@ -25,10 +25,8 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Multiset; import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialMultimap; import java.util.Objects; /** @@ -44,13 +42,13 @@ import java.util.Objects; public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDto> implements ObserveDto { public static <R extends ReferentialDto> Builder<R> builder(Class<R> referentialName) { - Objects.nonNull(referentialName); + Objects.requireNonNull(referentialName); return new Builder<>(referentialName); } private final Class<R> referentialName; - private final ReferentialMultimap<R> referentialToAdd; - private final ReferentialMultimap<R> referentialToUpdate; + private final ImmutableSet<R> referentialToAdd; + private final ImmutableSet<R> referentialToUpdate; private final ImmutableSet<String> referentialToRemove; private final ImmutableMap<String, String> referentialToReplace; @@ -59,25 +57,11 @@ public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDt } public ImmutableSet<R> getReferentialToAdd() { - ImmutableSet<R> result = ImmutableSet.of(); - - Multiset<Class<R>> entries = referentialToAdd.keys(); - if (!entries.isEmpty()) { - result = referentialToAdd.get(entries.iterator().next()); - } - - return result; + return referentialToAdd; } public ImmutableSet<R> getReferentialToUpdate() { - ImmutableSet<R> result = ImmutableSet.of(); - - Multiset<Class<R>> entries = referentialToUpdate.keys(); - if (!entries.isEmpty()) { - result = referentialToUpdate.get(entries.iterator().next()); - } - - return result; + return referentialToUpdate; } public ImmutableSet<String> getReferentialToRemove() { @@ -116,8 +100,8 @@ public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDt } private UnidirectionalReferentialSynchronizeRequest(Class<R> referentialName, - ReferentialMultimap<R> referentialToAdd, - ReferentialMultimap<R> referentialToUpdate, + ImmutableSet<R> referentialToAdd, + ImmutableSet<R> referentialToUpdate, ImmutableSet<String> referentialToRemove, ImmutableMap<String, String> toReplace) { this.referentialName = referentialName; @@ -130,27 +114,27 @@ public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDt public static class Builder<R extends ReferentialDto> { private final Class<R> referentialName; - private final ReferentialMultimap.Builder<R> toAddBuilder = ReferentialMultimap.builder(); - private final ReferentialMultimap.Builder<R> toUpdateBuilder = ReferentialMultimap.builder(); + private final ImmutableSet.Builder<R> toAddBuilder = ImmutableSet.builder(); + private final ImmutableSet.Builder<R> toUpdateBuilder = ImmutableSet.builder(); private final ImmutableSet.Builder<String> toRemoveBuilder = ImmutableSet.builder(); private final ImmutableMap.Builder<String, String> toReplaceBuilder = ImmutableMap.builder(); - public Builder entityToAdd(R referentialDto) { + Builder entityToAdd(R referentialDto) { toAddBuilder.add(referentialDto); return this; } - public Builder entityToUpdate(R referentialDto) { + Builder entityToUpdate(R referentialDto) { toUpdateBuilder.add(referentialDto); return this; } - public Builder entityToRemove(String id) { + Builder entityToRemove(String id) { toRemoveBuilder.add(id); return this; } - public Builder entityToReplace(String sourceId, String targetId) { + Builder entityToReplace(String sourceId, String targetId) { toReplaceBuilder.put(sourceId, targetId); return this; } ===================================== services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java @@ -27,6 +27,7 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimaps; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Set; import java.util.stream.Collectors; @@ -36,15 +37,15 @@ import java.util.stream.Collectors; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class AddSqlScriptProducerRequest { - - protected final boolean postgres; - protected boolean addSchema; - protected boolean addReferential; - protected boolean addSomeReferential; - protected boolean addData; - protected ImmutableSet<String> dataIds; - protected final ArrayListMultimap<Class<? extends ReferentialDto>, String> referentialIds = ArrayListMultimap.create(); +public class AddSqlScriptProducerRequest implements ObserveDto { + + private final boolean postgres; + private boolean addSchema; + private boolean addReferential; + private boolean addSomeReferential; + private boolean addData; + private ImmutableSet<String> dataIds; + private final ArrayListMultimap<Class<? extends ReferentialDto>, String> referentialIds = ArrayListMultimap.create(); public static AddSqlScriptProducerRequest forH2() { return new AddSqlScriptProducerRequest(false); ===================================== services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerResult.java @@ -24,13 +24,14 @@ package fr.ird.observe.services.service.sql; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.ObserveBlobsContainer; +import fr.ird.observe.services.dto.ObserveDto; /** * Created on 24/08/16. * * @author Tony Chemit - dev(a)tchemit.fr */ -public class AddSqlScriptProducerResult { +public class AddSqlScriptProducerResult implements ObserveDto{ private final byte[] sqlCode; ===================================== services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java @@ -24,6 +24,8 @@ package fr.ird.observe.services.service.sql; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ObserveDto; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -31,7 +33,7 @@ import java.util.stream.Collectors; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class DeleteSqlScriptProducerRequest { +public class DeleteSqlScriptProducerRequest implements ObserveDto { protected boolean deleteData; protected ImmutableSet<String> dataIds; @@ -40,26 +42,14 @@ public class DeleteSqlScriptProducerRequest { return new DeleteSqlScriptProducerRequest(); } - public static DeleteSqlScriptProducerRequest forH2() { - return new DeleteSqlScriptProducerRequest(); - } - - public static DeleteSqlScriptProducerRequest forPostgres() { - return new DeleteSqlScriptProducerRequest(); - } - - public DeleteSqlScriptProducerRequest deleteAllData() { - deleteData = true; - return this; - } - public DeleteSqlScriptProducerRequest dataIdsToDelete(ImmutableSet<String> dataIds) { - deleteData = true; + Objects.requireNonNull(dataIds); + this.deleteData = true; this.dataIds = dataIds; return this; } - protected DeleteSqlScriptProducerRequest() { + private DeleteSqlScriptProducerRequest() { } public boolean isDeleteData() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/900f27411375af7a268cc9b4298… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/900f27411375af7a268cc9b4298… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch 843-ps-probleme-de-validation-sur-captures-cibles-conservees
by Tony CHEMIT 10 Aug '17

10 Aug '17

Tony CHEMIT deleted branch 843-ps-probleme-de-validation-sur-captures-cibles-conservees at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch 843-ps-probleme-de-validation-sur-captures-cibles-conservees
by Tony CHEMIT 10 Aug '17

10 Aug '17

Tony CHEMIT pushed new branch 843-ps-probleme-de-validation-sur-captures-cibles-conservees at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/843-ps-probleme-de-validation… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve ui handler filtering referential sets API
by Tony CHEMIT 08 Aug '17

08 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1cff663a by Tony CHEMIT at 2017-08-08T13:50:16+02:00 Improve ui handler filtering referential sets API - - - - - 15 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -103,9 +103,11 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.TreeMap; import java.util.Vector; import javax.swing.AbstractButton; import javax.swing.ActionMap; @@ -162,6 +164,18 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U /** l'interface graphique que le controleur utilise */ protected U ui; + private final Map<String, ReferentialReferencesFilter> referentialsFilters = new TreeMap<>(); + + protected interface ReferentialReferencesFilter<D extends ReferentialDto> { + + List<ReferentialReference<D>> filter(List<ReferentialReference<D>> incomingReferences); + + } + + protected void addReferentialFilter(String propertyName, ReferentialReferencesFilter filter) { + referentialsFilters.put(propertyName, filter); + } + public void beforeInit(U ui) { this.ui = ui; prefix = "[" + ui.getClass().getSimpleName() + "] "; @@ -673,6 +687,13 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U // by default always remove obsolete references List<ReferentialReference<D>> referentialReferences = ReferentialReferences.filterEnabled(incomingReferences); log.debug(String.format("Filter referential references (type %s - property %s), without diabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); + + //noinspection unchecked + ReferentialReferencesFilter<D> referentialReferencesFilter = referentialsFilters.get(propertyName); + if (referentialReferencesFilter!=null) { + return referentialReferencesFilter.filter(referentialReferences); + } + return referentialReferences; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -35,13 +35,13 @@ import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.PersonHelper; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import java.util.Collection; import java.util.Date; -import java.util.LinkedList; import java.util.List; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; @@ -69,6 +69,23 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr TripLonglineUIHandler() { super(DataContextType.Program, DataContextType.TripLongline, n("observe.content.tripLongline.message.not.open")); + addReferentialFilter(TripLonglineDto.PROPERTY_CAPTAIN, (ReferentialReferencesFilter<PersonDto>) incomingReferences -> { + List<ReferentialReference<PersonDto>> result = PersonHelper.filterCaptainReferences(incomingReferences); + return ReferentialReferences.filterEnabled(result); + }); + addReferentialFilter(TripLonglineDto.PROPERTY_OBSERVER, (ReferentialReferencesFilter<PersonDto>) incomingReferences -> { + List<ReferentialReference<PersonDto>> result = PersonHelper.filterObserverReferences(incomingReferences); + return ReferentialReferences.filterEnabled(result); + }); + addReferentialFilter(TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, (ReferentialReferencesFilter<PersonDto>) incomingReferences -> { + List<ReferentialReference<PersonDto>> result = PersonHelper.filterDataEntryOperatorReferences(incomingReferences); + return ReferentialReferences.filterEnabled(result); + }); + addReferentialFilter(TripLonglineDto.PROPERTY_VESSEL, (ReferentialReferencesFilter<VesselDto>) incomingReferences -> { + ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); + List<ReferentialReference<VesselDto>> result = VesselHelper.filterVesselReferencesByVesselTypeIds(incomingReferences, config.getLonglineVesselTypeIds()); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -315,50 +332,4 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr return !create && getOpenDataManager().canOpenTripLongline(); } - - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case TripLonglineDto.PROPERTY_CAPTAIN: { - result = (List) PersonHelper.filterCaptainReferences((List) result); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - break; - - case TripLonglineDto.PROPERTY_OBSERVER: { - result = (List) PersonHelper.filterObserverReferences((List) result); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - break; - - case TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR: { - result = (List) PersonHelper.filterDataEntryOperatorReferences((List) result); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - break; - - case TripLonglineDto.PROPERTY_VESSEL: { - ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); - result = (List) VesselHelper.filterVesselReferencesByVesselTypeIds((List) result, config.getLonglineVesselTypeIds()); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - break; - - } - - return result; - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -32,15 +32,15 @@ import fr.ird.observe.client.ui.util.tripMap.TripMapUI; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; +import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.PersonHelper; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; -import java.util.Collection; import java.util.Date; -import java.util.LinkedList; import java.util.List; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; @@ -66,6 +66,23 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein TripSeineUIHandler() { super(DataContextType.Program, DataContextType.TripSeine, n("observe.content.tripSeine.message.not.open")); + addReferentialFilter(TripSeineDto.PROPERTY_CAPTAIN, (ReferentialReferencesFilter<PersonDto>) incomingReferences -> { + List<ReferentialReference<PersonDto>> result = PersonHelper.filterCaptainReferences(incomingReferences); + return ReferentialReferences.filterEnabled(result); + }); + addReferentialFilter(TripSeineDto.PROPERTY_OBSERVER, (ReferentialReferencesFilter<PersonDto>) incomingReferences -> { + List<ReferentialReference<PersonDto>> result = PersonHelper.filterObserverReferences(incomingReferences); + return ReferentialReferences.filterEnabled(result); + }); + addReferentialFilter(TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, (ReferentialReferencesFilter<PersonDto>) incomingReferences -> { + List<ReferentialReference<PersonDto>> result = PersonHelper.filterDataEntryOperatorReferences(incomingReferences); + return ReferentialReferences.filterEnabled(result); + }); + addReferentialFilter(TripSeineDto.PROPERTY_VESSEL, (ReferentialReferencesFilter<VesselDto>) incomingReferences -> { + ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); + List<ReferentialReference<VesselDto>> result = VesselHelper.filterVesselReferencesByVesselTypeIds(incomingReferences, config.getLonglineVesselTypeIds()); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -309,49 +326,4 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein return !create && getOpenDataManager().canOpenTripSeine(); } - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case TripSeineDto.PROPERTY_CAPTAIN: { - result = (List) PersonHelper.filterCaptainReferences((List) result); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - break; - - case TripSeineDto.PROPERTY_OBSERVER: { - result = (List) PersonHelper.filterObserverReferences((List) result); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - break; - - case TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR: { - result = (List) PersonHelper.filterDataEntryOperatorReferences((List) result); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - break; - - case TripSeineDto.PROPERTY_VESSEL: { - ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); - result = (List) VesselHelper.filterVesselReferencesByVesselTypeIds((List) result, config.getSeineVesselTypeIds()); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - break; - - } - - return result; - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -52,7 +52,6 @@ import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; @@ -62,11 +61,9 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.beans.PropertyChangeListener; import java.util.Calendar; -import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; import javax.swing.JComponent; @@ -132,7 +129,21 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat branchlineChanged = evt -> onBranchlineChanged((DataReference<BranchlineDto>) evt.getNewValue()); weightTableModelModified = evt -> onWeightTableModelModified((Boolean) evt.getNewValue()); sizeTableModelModified = evt -> onSizeTableModelModified((Boolean) evt.getNewValue()); - depredatedChanged = evt -> onDepretadedChanged((Boolean) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); + depredatedChanged = evt -> onDepredatedChanged((Boolean) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); + + addReferentialFilter(CatchLonglineDto.PROPERTY_SPECIES_CATCH, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId(); + String tripLonglineId = getDataContext().getSelectedTripLonglineId(); + List<ReferentialReference<SpeciesDto>> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId); + return ReferentialReferences.filterEnabled(result); + }); + + addReferentialFilter(CatchLonglineDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId(); + String tripLonglineId = getDataContext().getSelectedTripLonglineId(); + List<ReferentialReference<SpeciesDto>> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -462,7 +473,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } //FIXME Voir si pas besoin aussi de relancer les binding (catchFateChanged, branchlineChanged) ? - onDepretadedChanged(bean.getDepredated(), bean); + onDepredatedChanged(bean.getDepredated(), bean); } @@ -654,43 +665,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case CatchLonglineDto.PROPERTY_SPECIES_CATCH: - case CatchLonglineDto.PROPERTY_PREDATOR: { - String speciesListId; - - if (CatchLonglineDto.PROPERTY_SPECIES_CATCH.equals(propertyName)) { - speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId(); - } else { - speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId(); - } - - String tripLonglineId = getDataContext().getSelectedTripLonglineId(); - - TripLonglineService tripLonglineService = getTripLonglineService(); - result = (List) tripLonglineService.getSpeciesByListAndTrip(tripLonglineId, speciesListId); - - result = ReferentialReferences.filterEnabled(result); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - - break; - } - - } - - return result; - - } - - @Override protected void closeSafeUI() { if (log.isInfoEnabled()) { @@ -831,7 +805,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } - private void onDepretadedChanged(Boolean newValue, CatchLonglineDto tableEditBean) { + private void onDepredatedChanged(Boolean newValue, CatchLonglineDto tableEditBean) { CatchLonglineUI ui = getUi(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java @@ -32,14 +32,12 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterHelper; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.referential.ReferentialService; -import java.util.Collection; -import java.util.LinkedList; +import java.util.List; import java.util.Set; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; @@ -63,6 +61,16 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn EncounterUIHandler() { super(DataContextType.ActivityLongline); + addReferentialFilter(EncounterDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId(); + Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId); + SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); + + Set<String> speciesIds = speciesListDto.getSpeciesIds(); + + List<ReferentialReference<SpeciesDto>> result = ReferentialReferences.filterContains(incomingReferences, speciesIds); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -117,37 +125,4 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn ActivityLonglineEncounterHelper.copyActivityLonglineEncounterDto(form.getObject(), getBean()); } - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case EncounterDto.PROPERTY_SPECIES: { - - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId(); - - ReferentialService referentialService = getReferentialService(); - - Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); - SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); - - Set<String> speciesIds = speciesListDto.getSpeciesIds(); - - result = ReferentialReferences.filterContains(result, speciesIds); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; - - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java @@ -37,18 +37,15 @@ import fr.ird.observe.services.dto.longline.SetLonglineTdrHelper; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; import javax.swing.JComponent; @@ -104,6 +101,12 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt Boolean newValue = (Boolean) evt.getNewValue(); onToogleTimeEditorSliderChanged(newValue); }; + addReferentialFilter(TdrDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId(); + String tripLonglineId = getDataContext().getSelectedTripLonglineId(); + List<ReferentialReference<SpeciesDto>> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -447,36 +450,6 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt } @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case TdrDto.PROPERTY_SPECIES: { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId(); - - String tripLonglineId = getDataContext().getSelectedTripLonglineId(); - - TripLonglineService tripLonglineService = getTripLonglineService(); - result = (List) tripLonglineService.getSpeciesByListAndTrip(tripLonglineId, speciesListId); - - result = ReferentialReferences.filterEnabled(result); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - - break; - } - - } - - return result; - - } - - @Override protected void loadEditBean(String beanId) { Form<SetLonglineTdrDto> form = getTdrService().loadForm(beanId); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.client.ui.util.table.AutotSelectRowAndShowPopupActionSuppo import fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; @@ -40,7 +40,6 @@ import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseHelper; import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.LinkedList; @@ -89,6 +88,11 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei Boolean newValue = (Boolean) evt.getNewValue(); onToggleTimeEditorSliderChanged(newValue); }; + addReferentialFilter(NonTargetCatchReleaseDto.PROPERTY_SPECIES, incomingReferences -> { + ReferentialReferenceSet<SpeciesDto> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId()); + return new LinkedList<>(sampleSpecies.getReferences()); +// return ReferentialReferences.filterEnabled(result); + }); } private void updateSpecies(ReferentialReference species) { @@ -254,29 +258,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineNonTargetCatchReleaseHelper.copySetSeineNonTargetCatchReleaseDto(form.getObject(), getBean()); - } - - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case NonTargetCatchReleaseDto.PROPERTY_SPECIES: { - - result = (Collection) getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId()).getReferences(); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -33,7 +33,6 @@ import fr.ird.observe.services.decoration.decorators.ReferentialReferenceDecorat import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; @@ -42,11 +41,8 @@ import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetCatchHelper; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper; -import fr.ird.observe.services.service.data.seine.TripSeineService; import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; import java.util.List; import java.util.Set; import javax.swing.JComponent; @@ -374,36 +370,16 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineNonTargetCatchHelper.copySetSeineNonTargetCatchDto(form.getObject(), getBean()); - } - - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case NonTargetCatchDto.PROPERTY_SPECIES: { - - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); - String tripSeineId = getDataContext().getSelectedTripSeineId(); + addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { - TripSeineService tripSeineService = getTripSeineService(); - result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); + String tripLonglineId = getDataContext().getSelectedTripLonglineId(); - result = ReferentialReferences.filterEnabled(result); + List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; + return ReferentialReferences.filterEnabled(result); + }); } boolean showReasonForDiscard(ReferentialReference<SpeciesFateDto> speciesFate) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.client.ui.content.ContentMode; import fr.ird.observe.client.ui.content.table.ContentTableModel; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -64,6 +64,19 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS /** Logger */ private static final Log log = LogFactory.getLog(NonTargetSampleUIHandler.class); + NonTargetSampleUIHandler() { + addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES, incomingReferences -> { + ReferentialReferenceSet<SpeciesDto> sampleSpecies = getNonTargetSampleService().getSampleSpecies(getSelectedParentId()); + return new LinkedList<>(sampleSpecies.getReferences()); +// return ReferentialReferences.filterEnabled(result); + }); + addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES_FATE, incomingReferences -> { + Collection<ReferentialReference<SpeciesFateDto>> speciesFate = getModel().getForm().getObject().getSpeciesFate(); + return new LinkedList<>(speciesFate); +// return ReferentialReferences.filterEnabled(result); + }); + } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); @@ -314,42 +327,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS updateUiWithReferenceSetsFromModel(); NonTargetSampleHelper.copyNonTargetSampleDto(form.getObject(), getBean()); - } - - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case NonTargetLengthDto.PROPERTY_SPECIES: { - - result = (Collection) getNonTargetSampleService().getSampleSpecies(getSelectedParentId()).getReferences(); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - case NonTargetLengthDto.PROPERTY_SPECIES_FATE: { - - // on conserve uniquement les devenir utilisés dans les captures - Collection<ReferentialReference<SpeciesFateDto>> speciesFate = getModel().getForm().getObject().getSpeciesFate(); - result = (Collection) speciesFate; - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -28,7 +28,6 @@ import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; @@ -37,9 +36,7 @@ import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesHelper; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.service.referential.ReferentialService; -import java.util.Collection; -import java.util.LinkedList; +import java.util.List; import java.util.Set; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; @@ -61,6 +58,17 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati ObjectObservedSpeciesUIHandler() { super(DataContextType.SetSeine); + addReferentialFilter(ObjectSchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectObservedSpeciesId(); + Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId); + SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); + + Set<String> speciesIds = speciesListDto.getSpeciesIds(); + + List<ReferentialReference<SpeciesDto>> result = ReferentialReferences.filterContains(incomingReferences, speciesIds); + return ReferentialReferences.filterEnabled(result); + }); + } @Override @@ -110,36 +118,4 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati getModel().setForm(form); FloatingObjectObservedSpeciesHelper.copyFloatingObjectObservedSpeciesDto(form.getObject(), getBean()); } - - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectObservedSpeciesId(); - - ReferentialService referentialService = getReferentialService(); - Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); - SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); - - Set<String> speciesIds = speciesListDto.getSpeciesIds(); - - result = ReferentialReferences.filterContains(result, speciesIds); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; - - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -28,16 +28,13 @@ import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateHelper; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.service.referential.ReferentialService; -import java.util.Collection; -import java.util.LinkedList; +import java.util.List; import java.util.Set; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; @@ -60,6 +57,16 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin ObjectSchoolEstimateUIHandler() { super(DataContextType.SetSeine); + addReferentialFilter(ObjectSchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectSchoolEstimateId(); + Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId); + SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); + + Set<String> speciesIds = speciesListDto.getSpeciesIds(); + + List<ReferentialReference<SpeciesDto>> result = ReferentialReferences.filterContains(incomingReferences, speciesIds); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -107,34 +114,4 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin FloatingObjectSchoolEstimateHelper.copyFloatingObjectSchoolEstimateDto(form.getObject(), getBean()); } - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectSchoolEstimateId(); - - ReferentialService referentialService = getReferentialService(); - Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); - SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); - - Set<String> speciesIds = speciesListDto.getSpeciesIds(); - result = ReferentialReferences.filterContains(result, speciesIds); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; - - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -29,25 +29,18 @@ import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateHelper; -import fr.ird.observe.services.service.data.seine.TripSeineService; -import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -59,11 +52,15 @@ import static org.nuiton.i18n.I18n.n; */ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoolEstimateDto, SchoolEstimateDto, SchoolEstimateUI> implements UIHandler<SchoolEstimateUI> { - /** Logger */ - private static final Log log = LogFactory.getLog(SchoolEstimateUIHandler.class); - SchoolEstimateUIHandler() { super(DataContextType.SetSeine); + addReferentialFilter(SchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId(); + + String tripSeineId = getDataContext().getSelectedTripSeineId(); + List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -138,34 +135,4 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo SetSeineSchoolEstimateHelper.copySetSeineSchoolEstimateDto(form.getObject(), getBean()); } - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { - - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId(); - String tripSeineId = getDataContext().getSelectedTripSeineId(); - - TripSeineService tripSeineService = getTripSeineService(); - result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); - - result = ReferentialReferences.filterEnabled(result); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; - - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -31,20 +31,15 @@ import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; -import fr.ird.observe.services.service.data.seine.TripSeineService; -import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Set; import javax.swing.JComponent; @@ -72,6 +67,13 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa TargetCatchUIHandler() { super(DataContextType.SetSeine); + addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); + + String tripSeineId = getDataContext().getSelectedTripSeineId(); + List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -287,34 +289,4 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa SetSeineTargetCatchHelper.copySetSeineTargetCatchDto(form.getObject(), getBean()); } - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { - - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); - String tripSeineId = getDataContext().getSelectedTripSeineId(); - - TripSeineService tripSeineService = getTripSeineService(); - result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); - - result = ReferentialReferences.filterEnabled(result); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; - - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -31,22 +31,18 @@ import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferences; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; -import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.Set; @@ -75,6 +71,13 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT TargetDiscardCatchUIHandler() { super(DataContextType.SetSeine); + addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); + + String tripSeineId = getDataContext().getSelectedTripSeineId(); + List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -416,35 +419,4 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT SetSeineTargetCatchHelper.copySetSeineTargetCatchDto(form.getObject(), getBean()); } - - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { - - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); - String tripSeineId = getDataContext().getSelectedTripSeineId(); - - TripSeineService tripSeineService = getTripSeineService(); - result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); - - result = ReferentialReferences.filterEnabled(result); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - } - - break; - - } - - return result; - - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -29,6 +29,8 @@ import fr.ird.observe.client.ui.content.table.ContentTableModel; import fr.ird.observe.client.ui.content.table.ContentTableUI; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; @@ -73,6 +75,15 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar public TargetSampleUIHandler(boolean discarded) { this.discarded = discarded; + addReferentialFilter(TargetLengthDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { + List<ReferentialReference<SpeciesDto>> result = TargetSampleUIHandler.this.getTargetSampleService().getSampleSpecies(TargetSampleUIHandler.this.getSelectedParentId(), discarded); + return ReferentialReferences.filterEnabled(result); + }); + addReferentialFilter(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, (ReferentialReferencesFilter<SizeMeasureTypeDto>) incomingReferences -> { + List<ReferentialReference<SizeMeasureTypeDto>> result = SizeMeasureTypeHelper.filterForSeine(incomingReferences); + checkSizeMeasureTypes(result); + return ReferentialReferences.filterEnabled(result); + }); } @Override @@ -353,40 +364,6 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar TargetSampleHelper.copyTargetSampleDto(form.getObject(), getBean()); } - @Override - protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - - Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); - - switch (propertyName) { - - case TargetLengthDto.PROPERTY_SPECIES: { - - result = (List) getTargetSampleService().getSampleSpecies(getSelectedParentId(), discarded); - - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } - - } - - break; - - case TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE: { - - result = SizeMeasureTypeHelper.filterForSeine((Collection) incomingReferences); - if (log.isInfoEnabled()) { - log.info("Using " + result.size() + " size measure type(s)."); - } - checkSizeMeasureTypes((List) result); - } - } - - - return result; - - } - private Optional<ReferentialReference<SizeMeasureTypeDto>> getSpeciesDefaultSizeMeasureType(ReferentialReference<SpeciesDto> species) { Optional<ReferentialReference<SizeMeasureTypeDto>> result = Optional.empty(); if (species != null) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1cff663af00bbe034f55e1a0788… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1cff663af00bbe034f55e1a0788… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Let ui handler be a Services provider, helps a lot
by Tony CHEMIT 06 Aug '17

06 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 43206554 by Tony CHEMIT at 2017-08-06T22:39:19+02:00 Let ui handler be a Services provider, helps a lot - - - - - 29 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/SetLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/SetSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/dcp/FloatingObjectPartsTableCellRenderer.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/ActivityLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/RouteUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/SensorUsedUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -53,6 +53,46 @@ import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.LastUpdateDateService; +import fr.ird.observe.services.service.ObserveService; +import fr.ird.observe.services.service.PingService; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; +import fr.ird.observe.services.service.actions.report.ReportService; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; +import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; +import fr.ird.observe.services.service.actions.validate.ValidateService; +import fr.ird.observe.services.service.data.NavigationService; +import fr.ird.observe.services.service.data.TripManagementService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.BranchlineService; +import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; +import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.TdrService; +import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchService; +import fr.ird.observe.services.service.data.seine.NonTargetSampleService; +import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.service.data.seine.RouteService; +import fr.ird.observe.services.service.data.seine.SchoolEstimateService; +import fr.ird.observe.services.service.data.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.TargetCatchService; +import fr.ird.observe.services.service.data.seine.TargetSampleService; +import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import java.awt.Component; import java.awt.Dimension; import java.awt.FocusTraversalPolicy; @@ -97,6 +137,7 @@ import org.nuiton.jaxx.widgets.select.FilterableDoubleList; import org.nuiton.validator.NuitonValidatorScope; +import static fr.ird.observe.client.db.ObserveSwingDataSource.MAIN; import static org.nuiton.i18n.I18n.t; /** @@ -105,7 +146,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.4 */ -public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U>> { +public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U>> implements ObserveServicesProvider { /** Logger */ static private final Log log = LogFactory.getLog(ContentUIHandler.class); @@ -121,7 +162,6 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U /** l'interface graphique que le controleur utilise */ protected U ui; - public void beforeInit(U ui) { this.ui = ui; prefix = "[" + ui.getClass().getSimpleName() + "] "; @@ -1182,10 +1222,6 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - protected ObserveServicesProvider getServicesProvider() { - return ObserveSwingDataSource.MAIN; - } - protected <D extends ReferentialDto> FormRequestDefinition<D> getReferentialFormRequest(Class<D> type) { return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); } @@ -1197,4 +1233,209 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U private <D extends ReferentialDto> FormRequestDefinition<D> getFormRequest(String type) { return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); } + + @Override + public <S extends ObserveService> S getService(Class<S> serviceType) { + return MAIN.getService(serviceType); + } + + @Override + public LastUpdateDateService getLastUpdateDateService() { + return MAIN.getLastUpdateDateService(); + } + + @Override + public SqlScriptProducerService getSqlScriptProducerService() { + return MAIN.getSqlScriptProducerService(); + } + + @Override + public ValidateService getValidateService() { + return MAIN.getValidateService(); + } + + @Override + public ReportService getReportService() { + return MAIN.getReportService(); + } + + @Override + public PingService getPingService() { + return MAIN.getPingService(); + } + + @Override + public TripManagementService getTripManagementService() { + return MAIN.getTripManagementService(); + } + + @Override + public ConsolidateDataService getConsolidateDataService() { + return MAIN.getConsolidateDataService(); + } + + @Override + public UnidirectionalReferentialSynchronizeLocalService getUnidirectionalReferentialSynchronizeLocalService() { + return MAIN.getUnidirectionalReferentialSynchronizeLocalService(); + } + + @Override + public ReferentialSynchronizeService getReferentialSynchronizeService() { + return MAIN.getReferentialSynchronizeService(); + } + + @Override + public ReferentialSynchronizeDiffService getReferentialSynchronizeDiffService() { + return MAIN.getReferentialSynchronizeDiffService(); + } + + @Override + public DataSourceService getDataSourceService() { + return MAIN.getDataSourceService(); + } + + @Override + public NavigationService getNavigationService() { + return MAIN.getNavigationService(); + } + + @Override + public ReferentialService getReferentialService() { + return MAIN.getReferentialService(); + } + + @Override + public TripSeineService getTripSeineService() { + return MAIN.getTripSeineService(); + } + + @Override + public RouteService getRouteService() { + return MAIN.getRouteService(); + } + + @Override + public FloatingObjectService getFloatingObjectService() { + return MAIN.getFloatingObjectService(); + } + + @Override + public ActivitySeineService getActivitySeineService() { + return MAIN.getActivitySeineService(); + } + + @Override + public SetSeineService getSetSeineService() { + return MAIN.getSetSeineService(); + } + + @Override + public TripLonglineService getTripLonglineService() { + return MAIN.getTripLonglineService(); + } + + @Override + public ActivityLonglineService getActivityLonglineService() { + return MAIN.getActivityLonglineService(); + } + + @Override + public SetLonglineService getSetLonglineService() { + return MAIN.getSetLonglineService(); + } + + @Override + public SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { + return MAIN.getSetLonglineGlobalCompositionService(); + } + + @Override + public SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() { + return MAIN.getSetLonglineDetailCompositionService(); + } + + @Override + public TransmittingBuoyOperationService getTransmittingBuoyOperationService() { + return MAIN.getTransmittingBuoyOperationService(); + } + + @Override + public BranchlineService getBranchlineService() { + return MAIN.getBranchlineService(); + } + + @Override + public SetLonglineCatchService getSetLonglineCatchService() { + return MAIN.getSetLonglineCatchService(); + } + + @Override + public ActivityLongLineEncounterService getActivityLongLineEncounterService() { + return MAIN.getActivityLongLineEncounterService(); + } + + @Override + public TripLonglineGearUseService getTripLonglineGearUseService() { + return MAIN.getTripLonglineGearUseService(); + } + + @Override + public ActivityLongLineSensorUsedService getActivityLongLineSensorUsedService() { + return MAIN.getActivityLongLineSensorUsedService(); + } + + @Override + public TdrService getTdrService() { + return MAIN.getTdrService(); + } + + @Override + public TripSeineGearUseService getTripSeineGearUseService() { + return MAIN.getTripSeineGearUseService(); + } + + @Override + public NonTargetCatchService getNonTargetCatchService() { + return MAIN.getNonTargetCatchService(); + } + + @Override + public NonTargetCatchReleaseService getNonTargetCatchReleaseService() { + return MAIN.getNonTargetCatchReleaseService(); + } + + @Override + public NonTargetSampleService getNonTargetSampleService() { + return MAIN.getNonTargetSampleService(); + } + + @Override + public ObjectObservedSpeciesService getObjectObservedSpeciesService() { + return MAIN.getObjectObservedSpeciesService(); + } + + @Override + public ObjectSchoolEstimateService getObjectSchoolEstimateService() { + return MAIN.getObjectSchoolEstimateService(); + } + + @Override + public SchoolEstimateService getSchoolEstimateService() { + return MAIN.getSchoolEstimateService(); + } + + @Override + public TargetCatchService getTargetCatchService() { + return MAIN.getTargetCatchService(); + } + + @Override + public TargetSampleService getTargetSampleService() { + return MAIN.getTargetSampleService(); + } + + @Override + public void close() { + + } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -1377,8 +1377,4 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - private SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() { - return getServicesProvider().getSetLonglineDetailCompositionService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -40,7 +40,6 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -236,9 +235,4 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong getUi().getBaitsCompositionUI().getHandler().afterSave(refresh); } - private SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { - - return getServicesProvider().getSetLonglineGlobalCompositionService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/SetLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/SetLonglineUIHandler.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineHelper; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.SetLonglineService; import java.beans.PropertyChangeListener; import java.util.HashSet; import java.util.Set; @@ -492,7 +491,4 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLo } - private SetLonglineService getSetLonglineService() { - return getServicesProvider().getSetLonglineService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -40,7 +40,6 @@ import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyHelper; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyHelper; -import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; import java.awt.GridLayout; import java.util.ArrayList; import java.util.Collection; @@ -364,8 +363,4 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH return objectOperation; } - private TransmittingBuoyOperationService getTransmittingBuoyOperationService() { - return getServicesProvider().getTransmittingBuoyOperationService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -47,7 +47,6 @@ import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectHelper; import fr.ird.observe.services.dto.seine.FloatingObjectPartDto; import fr.ird.observe.services.dto.seine.ObjectMaterialHierarchyDto; -import fr.ird.observe.services.service.data.seine.FloatingObjectService; import java.awt.Color; import java.util.HashSet; import java.util.List; @@ -416,10 +415,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, }, Color.RED, Color.WHITE)); } - private FloatingObjectService getFloatingObjectService() { - return getServicesProvider().getFloatingObjectService(); - } - protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { Set<String> errorProperties = new HashSet<>(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/SetSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/SetSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/SetSeineUIHandler.java @@ -39,8 +39,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineHelper; -import fr.ird.observe.services.service.data.seine.RouteService; -import fr.ird.observe.services.service.data.seine.SetSeineService; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.HashSet; @@ -179,9 +177,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> getModel().setForm(form); SetSeineHelper.copySetSeineDto(form.getObject(), bean); - RouteService routeService = getServicesProvider().getRouteService(); - - RouteDto route = routeService.loadDto(selectedRouteId); + RouteDto route = getRouteService().loadDto(selectedRouteId); Date time = bean.getStartTime(); @@ -339,7 +335,4 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> } - private SetSeineService getSetSeineService() { - return getServicesProvider().getSetSeineService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/dcp/FloatingObjectPartsTableCellRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/dcp/FloatingObjectPartsTableCellRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/dcp/FloatingObjectPartsTableCellRenderer.java @@ -23,7 +23,6 @@ package fr.ird.observe.client.ui.content.impl.seine.dcp; */ import fr.ird.observe.client.ui.util.treetable.JRadioButtonProvider; -import fr.ird.observe.services.dto.seine.ObjectMaterialHierarchyDto; import java.awt.Component; import java.util.Objects; import javax.swing.JTable; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/ActivityLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -35,7 +35,6 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; -import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import java.util.Optional; import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; @@ -304,7 +303,4 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin } - private ActivityLonglineService getActivityLonglineService() { - return getServicesProvider().getActivityLonglineService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.util.Collection; import java.util.Date; import java.util.LinkedList; @@ -362,7 +361,4 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr return result; } - private TripLonglineService getTripLonglineService() { - return getServicesProvider().getTripLonglineService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.data.seine.ActivitySeineService; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -372,8 +371,4 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, } - private ActivitySeineService getActivitySeineService() { - return getServicesProvider().getActivitySeineService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/RouteUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/RouteUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/RouteUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteHelper; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.data.seine.RouteService; import java.util.Date; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; @@ -413,7 +412,4 @@ class RouteUIHandler extends ContentOpenableUIHandler<RouteDto, RouteUI> impleme return !create && getOpenDataManager().canOpenRoute(getSelectedParentId()); } - private RouteService getRouteService() { - return getServicesProvider().getRouteService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; -import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.Collection; import java.util.Date; import java.util.LinkedList; @@ -355,8 +354,4 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein return result; } - private TripSeineService getTripSeineService() { - return getServicesProvider().getTripSeineService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java @@ -47,7 +47,6 @@ import fr.ird.observe.services.dto.referential.ProgramHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.service.referential.ReferentialService; import java.awt.Container; import java.awt.Dimension; import java.awt.Font; @@ -830,8 +829,4 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte binder.copy(source, target); } - private ReferentialService getReferentialService() { - return getServicesProvider().getReferentialService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -59,8 +59,6 @@ import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; import fr.ird.observe.services.dto.referential.longline.HealthnessDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.BranchlineService; -import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.beans.PropertyChangeListener; import java.util.Calendar; @@ -239,7 +237,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } String openSetLonglineId = getDataContext().getSelectedSetLonglineId(); - SaveResultDto saveResult = getBranchLineService().save(openSetLonglineId, branchline); + SaveResultDto saveResult = getBranchlineService().save(openSetLonglineId, branchline); saveResult.toDto(branchline); // on recopie le last update car c'est le laste update de SetLongline qui est renvoyé. @@ -674,7 +672,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat String tripLonglineId = getDataContext().getSelectedTripLonglineId(); - TripLonglineService tripLonglineService = getServicesProvider().getTripLonglineService(); + TripLonglineService tripLonglineService = getTripLonglineService(); result = (List) tripLonglineService.getSpeciesByListAndTrip(tripLonglineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -808,7 +806,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat String setLonglineId = getDataContext().getSelectedSetLonglineId(); - Form<BranchlineDto> form = getBranchLineService().loadForm(setLonglineId, newValue.getId()); + Form<BranchlineDto> form = getBranchlineService().loadForm(setLonglineId, newValue.getId()); BranchlineHelper.copyBranchlineDto(form.getObject(), branchline); if (ui.getValidator().getBean() == null) { @@ -1003,14 +1001,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat return (CatchLonglineTableModel) super.getTableModel(); } - private SetLonglineCatchService getSetLonglineCatchService() { - return getServicesProvider().getSetLonglineCatchService(); - } - - private BranchlineService getBranchLineService() { - return getServicesProvider().getBranchlineService(); - } - public void moveCatchLonglineUp() { int selectedRow = getUi().getTable().getSelectedRow(); getTableModel().moveUp(selectedRow); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; import fr.ird.observe.services.service.referential.ReferentialService; import java.util.Collection; import java.util.LinkedList; @@ -104,14 +103,14 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn @Override protected void doPersist(ActivityLonglineEncounterDto bean) { - SaveResultDto saveResult = getActivityLongLineEncouterService().save(bean); + SaveResultDto saveResult = getActivityLongLineEncounterService().save(bean); saveResult.toDto(bean); } @Override protected void loadEditBean(String beanId) { - Form<ActivityLonglineEncounterDto> form = getActivityLongLineEncouterService().loadForm(beanId); + Form<ActivityLonglineEncounterDto> form = getActivityLongLineEncounterService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); @@ -129,7 +128,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId(); - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); @@ -151,7 +150,4 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn } - private ActivityLongLineEncounterService getActivityLongLineEncouterService() { - return getServicesProvider().getActivityLongLineEncounterService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -45,7 +45,6 @@ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; import java.awt.GridBagConstraints; import java.awt.Insets; @@ -190,7 +189,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip List<GearUseFeaturesMeasurementLonglineDto> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId); @@ -480,8 +479,4 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip TripLonglineGearUseHelper.copyTripLonglineGearUseDto(form.getObject(), getBean()); } - private TripLonglineGearUseService getTripLonglineGearUseService() { - return getServicesProvider().getTripLonglineGearUseService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/SensorUsedUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -115,7 +114,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS DataFileDto dataFile = getTableEditBean().getData(); if (dataFile == null) { - dataFile = getActivityLonglineSensorUsedService().getDataFile(getTableEditBean().getId()); + dataFile = getActivityLongLineSensorUsedService().getDataFile(getTableEditBean().getId()); } int response = UIHelper.askUser(ui, @@ -180,7 +179,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS DataFileDto dataFile = getTableEditBean().getData(); if (dataFile == null) { - dataFile = getActivityLonglineSensorUsedService().getDataFile(getTableEditBean().getId()); + dataFile = getActivityLongLineSensorUsedService().getDataFile(getTableEditBean().getId()); } @@ -216,21 +215,17 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS @Override protected void doPersist(ActivityLonglineSensorUsedDto bean) { - SaveResultDto saveResult = getActivityLonglineSensorUsedService().save(bean); + SaveResultDto saveResult = getActivityLongLineSensorUsedService().save(bean); saveResult.toDto(bean); } @Override protected void loadEditBean(String beanId) { - Form<ActivityLonglineSensorUsedDto> form = getActivityLonglineSensorUsedService().loadForm(beanId); + Form<ActivityLonglineSensorUsedDto> form = getActivityLongLineSensorUsedService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); ActivityLonglineSensorUsedHelper.copyActivityLonglineSensorUsedDto(form.getObject(), getBean()); } - private ActivityLongLineSensorUsedService getActivityLonglineSensorUsedService() { - return getServicesProvider().getActivityLongLineSensorUsedService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java @@ -40,7 +40,6 @@ import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.TdrService; import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.beans.PropertyChangeListener; import java.io.File; @@ -459,7 +458,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt String tripLonglineId = getDataContext().getSelectedTripLonglineId(); - TripLonglineService tripLonglineService = getServicesProvider().getTripLonglineService(); + TripLonglineService tripLonglineService = getTripLonglineService(); result = (List) tripLonglineService.getSpeciesByListAndTrip(tripLonglineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -493,8 +492,4 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt SetLonglineTdrHelper.copySetLonglineTdrDto(form.getObject(), getBean()); } - - private TdrService getTdrService() { - return getServicesProvider().getTdrService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -45,7 +45,6 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseHelper; -import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; import java.awt.GridBagConstraints; import java.awt.Insets; @@ -190,7 +189,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei List<GearUseFeaturesMeasurementSeineDto> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId); @@ -480,8 +479,4 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei TripSeineGearUseHelper.copyTripSeineGearUseDto(form.getObject(), getBean()); } - private TripSeineGearUseService getTripSeineGearUseService() { - return getServicesProvider().getTripSeineGearUseService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java @@ -38,8 +38,6 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetCatchReleaseDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseHelper; -import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; -import fr.ird.observe.services.service.referential.ReferentialService; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collection; @@ -282,15 +280,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei } - private NonTargetCatchReleaseService getNonTargetCatchReleaseService() { - return getServicesProvider().getNonTargetCatchReleaseService(); - } - - - private ReferentialService getReferentialService() { - return getServicesProvider().getReferentialService(); - } - public void moveCatchLonglineUp() { int selectedRow = getUi().getTable().getSelectedRow(); getTableModel().moveUp(selectedRow); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -42,7 +42,6 @@ import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetCatchHelper; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper; -import fr.ird.observe.services.service.data.seine.NonTargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.beans.PropertyChangeListener; import java.util.ArrayList; @@ -389,7 +388,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); String tripSeineId = getDataContext().getSelectedTripSeineId(); - TripSeineService tripSeineService = getServicesProvider().getTripSeineService(); + TripSeineService tripSeineService = getTripSeineService(); result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -416,7 +415,4 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa return result; } - private NonTargetCatchService getNonTargetCatchService() { - return getServicesProvider().getNonTargetCatchService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.NonTargetSampleHelper; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.service.data.seine.NonTargetSampleService; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -354,10 +353,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS } - private NonTargetSampleService getNonTargetSampleService() { - return getServicesProvider().getNonTargetSampleService(); - } - private Optional<ReferentialReference<SizeMeasureTypeDto>> getSpeciesDefaultSizeMeasureType(ReferentialReference<SpeciesDto> species) { Optional<ReferentialReference<SizeMeasureTypeDto>> result = Optional.empty(); if (species != null) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesHelper; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; import fr.ird.observe.services.service.referential.ReferentialService; import java.util.Collection; import java.util.LinkedList; @@ -122,7 +121,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectObservedSpeciesId(); - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); @@ -143,7 +142,4 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati } - private ObjectObservedSpeciesService getObjectObservedSpeciesService() { - return getServicesProvider().getObjectObservedSpeciesService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -35,7 +35,6 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateHelper; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; import fr.ird.observe.services.service.referential.ReferentialService; import java.util.Collection; import java.util.LinkedList; @@ -118,7 +117,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectSchoolEstimateId(); - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); @@ -138,7 +137,4 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin } - private ObjectSchoolEstimateService getObjectSchoolEstimateService() { - return getServicesProvider().getObjectSchoolEstimateService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -36,7 +36,6 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateHelper; -import fr.ird.observe.services.service.data.seine.SchoolEstimateService; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.Collection; import java.util.Collections; @@ -151,7 +150,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId(); String tripSeineId = getDataContext().getSelectedTripSeineId(); - TripSeineService tripSeineService = getServicesProvider().getTripSeineService(); + TripSeineService tripSeineService = getTripSeineService(); result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -169,7 +168,4 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo } - private SchoolEstimateService getSchoolEstimateService() { - return getServicesProvider().getSchoolEstimateService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -41,7 +41,6 @@ import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; -import fr.ird.observe.services.service.data.seine.TargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.Collection; import java.util.Collections; @@ -300,7 +299,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); String tripSeineId = getDataContext().getSelectedTripSeineId(); - TripSeineService tripSeineService = getServicesProvider().getTripSeineService(); + TripSeineService tripSeineService = getTripSeineService(); result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -318,8 +317,4 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa } - private TargetCatchService getTargetCatchService() { - return getServicesProvider().getTargetCatchService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -42,7 +42,6 @@ import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; -import fr.ird.observe.services.service.data.seine.TargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.ArrayList; import java.util.Collection; @@ -430,7 +429,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); String tripSeineId = getDataContext().getSelectedTripSeineId(); - TripSeineService tripSeineService = getServicesProvider().getTripSeineService(); + TripSeineService tripSeineService = getTripSeineService(); result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -448,7 +447,4 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT } - private TargetCatchService getTargetCatchService() { - return getServicesProvider().getTargetCatchService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TargetSampleHelper; -import fr.ird.observe.services.service.data.seine.TargetSampleService; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -388,10 +387,6 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar } - private TargetSampleService getTargetSampleService() { - return getServicesProvider().getTargetSampleService(); - } - private Optional<ReferentialReference<SizeMeasureTypeDto>> getSpeciesDefaultSizeMeasureType(ReferentialReference<SpeciesDto> species) { Optional<ReferentialReference<SizeMeasureTypeDto>> result = Optional.empty(); if (species != null) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/432065545bf39071ddc58aed6b0… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/432065545bf39071ddc58aed6b0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 06 Aug '17

06 Aug '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: dcc51f82 by 166231 at 2017-08-06T20:03:13+00:00 Site checkin for project ObServe :: Pom - - - - - 29 changed files: - administration-web.html - aggregate-third-party-report.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - plugin-management.html - plugin-updates-report.html - plugins.html - project-info.html - project-reports.html - project-summary.html - property-updates-report.html - sitemap.html - source-repository.html - team-list.html - third-party-report.html Changes: ===================================== administration-web.html ===================================== --- a/administration-web.html +++ b/administration-web.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -102,7 +102,7 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.0-RC-5.log # logs de l'application + | `-- observeweb-7.0-RC-6-SNAPSHOT.log # logs de l'application |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== aggregate-third-party-report.html ===================================== The diff for this file was not included because it is too large. ===================================== architecture-logicielle.html ===================================== --- a/architecture-logicielle.html +++ b/architecture-logicielle.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== changelog.html ===================================== The diff for this file was not included because it is too large. ===================================== changes-report.html ===================================== The diff for this file was not included because it is too large. ===================================== config-report.html ===================================== --- a/config-report.html +++ b/config-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Configuration</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Configuration</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,19 +101,223 @@ <th>Nombre d'options</th> <th>Nombre d'actions</th></tr> <tr class="b"> -<td><a href="./config-report.html#detail_ClientConfig">ClientConfig</a></td> -<td>Configuration d'ObServe</td> -<td>83</td> -<td>9</td></tr> -<tr class="a"> <td><a href="./config-report.html#detail_ServerConfig">ServerConfig</a></td> <td>Observe web Configuration</td> <td>17</td> -<td>0</td></tr></table></div> +<td>0</td></tr> +<tr class="a"> +<td><a href="./config-report.html#detail_ClientConfig">ClientConfig</a></td> +<td>Configuration d'ObServe</td> +<td>83</td> +<td>9</td></tr></table></div> <div class="section"> <h2><a name="Dtail_des_configurations"></a>Détail des configurations</h2><br /> <p>On détaille ici une par une les configurations définies pour le projet</p> <div class="section"> +<h3><a name="Configuration___ServerConfig"></a><a name="detail_ServerConfig">Configuration ServerConfig</a></h3> +<p>Nom de la configuration : <b>ServerConfig</b></p> +<p>Description : <b>Observe web Configuration</b></p> +<div class="section"> +<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ServerConfig">Options de la configuration</a></h4><br /> +<table border="0" class="table table-striped"> +<tr class="b"> +<th>Clef</th> +<th>Description</th> +<th>Valeur par défaut</th> +<th>Option modifiable</th> +<th>Option sauvegardable</th> +<th>Type</th></tr> +<tr class="a"> +<td>observeweb.build.version</td> +<td>Version de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="b"> +<td>observeweb.build.date</td> +<td>Date de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.build.number</td> +<td>Numéro de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="b"> +<td>observeweb.adminApiKey</td> +<td>Clé API Admin (À changer)</td> +<td> +<div> +<pre style="monospaced">changeme</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.host</td> +<td>Hôte de l'application</td> +<td> +<div> +<pre style="monospaced">http://localhost:8080</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.net.URL</pre></div></td></tr> +<tr class="b"> +<td>observeweb.apiUrl</td> +<td>Url de l'api rest</td> +<td> +<div> +<pre style="monospaced">${observeweb.host}/${observeweb.contextPath}/api/v1</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.net.URL</pre></div></td></tr> +<tr class="a"> +<td>observeweb.model.version</td> +<td>Version du modèle</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="b"> +<td>observeweb.devMode</td> +<td>Mode développeur</td> +<td> +<div> +<pre style="monospaced">true</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">boolean</pre></div></td></tr> +<tr class="a"> +<td>observeweb.contextPath</td> +<td>Contexte applicatif</td> +<td> +<div> +<pre style="monospaced">observe</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="b"> +<td>observeweb.baseDirectory</td> +<td>Répertoire de l'application</td> +<td> +<div> +<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.temporaryDirectory</td> +<td>Chemin vers le répertoire temporaire</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.log4jConfigurationFile</td> +<td>Chemin vers le fichier de configuration des logs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.databasesConfigurationFile</td> +<td>Chemin vers le fichier de configuration des bases</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.usersConfigurationFile</td> +<td>Chemin vers le fichier de configuration des utilisateurs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.sessionExpirationDelay</td> +<td>Temps maximum d'une session (en minutes)</td> +<td> +<div> +<pre style="monospaced">60</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="b"> +<td>observeweb.sessionMaximumSize</td> +<td>Taille maximum de session</td> +<td> +<div> +<pre style="monospaced">10000</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="a"> +<td>observeweb.httpTimeout</td> +<td>Temps maximum de tentative de connection http (en millisecondes)</td> +<td> +<div> +<pre style="monospaced">30000</pre></div></td> +<td>Oui</td> +<td>Oui</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr></table></div> +<div class="section"> +<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ServerConfig">Actions de la configuration</a></h4><br /> +<p><b>Aucune action définie pour cette configuration</b></p></div></div> +<div class="section"> <h3><a name="Configuration___ClientConfig"></a><a name="detail_ClientConfig">Configuration ClientConfig</a></h3> <p>Nom de la configuration : <b>ClientConfig</b></p> <p>Description : <b>Configuration d'ObServe</b></p> @@ -445,7 +649,7 @@ <td>Oui</td> <td> <div> -<pre style="monospaced">fr.ird.observe.client.configuration.constants.DbMode</pre></div></td></tr> +<pre style="monospaced">fr.ird.observe.client.constants.DbMode</pre></div></td></tr> <tr class="b"> <td>defaultCreationMode</td> <td>Le mode de création de base locale par défaut</td> @@ -456,7 +660,7 @@ <td>Oui</td> <td> <div> -<pre style="monospaced">fr.ird.observe.client.configuration.constants.CreationMode</pre></div></td></tr> +<pre style="monospaced">fr.ird.observe.client.constants.CreationMode</pre></div></td></tr> <tr class="a"> <td>ui.storeRemoteStorage</td> <td>Pour activer la sauvegarde de la configuration de la source distante</td> @@ -1085,211 +1289,7 @@ Deux paramètres sont nécessaires: Le FQN de la classe Le nombre d'id à générer.</td> <td>--create-id</td> -<td>fr.ird.observe.client.ObserveCLAction#createId</td></tr></table></div></div> -<div class="section"> -<h3><a name="Configuration___ServerConfig"></a><a name="detail_ServerConfig">Configuration ServerConfig</a></h3> -<p>Nom de la configuration : <b>ServerConfig</b></p> -<p>Description : <b>Observe web Configuration</b></p> -<div class="section"> -<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ServerConfig">Options de la configuration</a></h4><br /> -<table border="0" class="table table-striped"> -<tr class="b"> -<th>Clef</th> -<th>Description</th> -<th>Valeur par défaut</th> -<th>Option modifiable</th> -<th>Option sauvegardable</th> -<th>Type</th></tr> -<tr class="a"> -<td>observeweb.build.version</td> -<td>Version de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="b"> -<td>observeweb.build.date</td> -<td>Date de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.build.number</td> -<td>Numéro de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.adminApiKey</td> -<td>Clé API Admin (À changer)</td> -<td> -<div> -<pre style="monospaced">changeme</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.host</td> -<td>Hôte de l'application</td> -<td> -<div> -<pre style="monospaced">http://localhost:8080</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.net.URL</pre></div></td></tr> -<tr class="b"> -<td>observeweb.apiUrl</td> -<td>Url de l'api rest</td> -<td> -<div> -<pre style="monospaced">${observeweb.host}/${observeweb.contextPath}/api/v1</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.net.URL</pre></div></td></tr> -<tr class="a"> -<td>observeweb.model.version</td> -<td>Version du modèle</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="b"> -<td>observeweb.devMode</td> -<td>Mode développeur</td> -<td> -<div> -<pre style="monospaced">true</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">boolean</pre></div></td></tr> -<tr class="a"> -<td>observeweb.contextPath</td> -<td>Contexte applicatif</td> -<td> -<div> -<pre style="monospaced">observe</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.baseDirectory</td> -<td>Répertoire de l'application</td> -<td> -<div> -<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.temporaryDirectory</td> -<td>Chemin vers le répertoire temporaire</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.log4jConfigurationFile</td> -<td>Chemin vers le fichier de configuration des logs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.databasesConfigurationFile</td> -<td>Chemin vers le fichier de configuration des bases</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.usersConfigurationFile</td> -<td>Chemin vers le fichier de configuration des utilisateurs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.sessionExpirationDelay</td> -<td>Temps maximum d'une session (en minutes)</td> -<td> -<div> -<pre style="monospaced">60</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="b"> -<td>observeweb.sessionMaximumSize</td> -<td>Taille maximum de session</td> -<td> -<div> -<pre style="monospaced">10000</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="a"> -<td>observeweb.httpTimeout</td> -<td>Temps maximum de tentative de connection http (en millisecondes)</td> -<td> -<div> -<pre style="monospaced">30000</pre></div></td> -<td>Oui</td> -<td>Oui</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr></table></div> -<div class="section"> -<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ServerConfig">Actions de la configuration</a></h4><br /> -<p><b>Aucune action définie pour cette configuration</b></p></div></div></div> +<td>fr.ird.observe.client.ObserveCLAction#createId</td></tr></table></div></div></div> </div> </div> </div> ===================================== dependency-convergence.html ===================================== --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Reactor Dependency Convergence</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Reactor Dependency Convergence</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -104,22 +104,22 @@ </caption> <tr class="b"> <th>Nombre de sous-projets :</th> -<td>18</td></tr> +<td>14</td></tr> <tr class="a"> <th>Nombre de dépendances (NOD) :</th> -<td>196</td></tr> +<td>149</td></tr> <tr class="b"> <th>Nombre d'artefacts uniques (NOA) :</th> -<td>204</td></tr> +<td>152</td></tr> <tr class="a"> <th>Number of version-conflicting artifacts (NOC):</th> -<td>4</td></tr> +<td>2</td></tr> <tr class="b"> <th>Nombre d'artefacts SNAPSHOT (NOS) :</th> <td>0</td></tr> <tr class="a"> <th>Convergence (NOD/NOA) :</th> -<td><img alt="[Error]" src="images/icon_error_sml.gif" /> <b>96 %</b></td></tr> +<td><img alt="[Error]" src="images/icon_error_sml.gif" /> <b>98 %</b></td></tr> <tr class="b"> <th>Prêt pour la release (100% de convergence et aucun SNAPSHOT) :</th> <td><img alt="[Error]" src="images/icon_error_sml.gif" /> <b>Erreur</b><br />Vous n'avez pas la convergence à 100%.</td></tr></table></div> @@ -136,12 +136,12 @@ <td width="25%">3.3</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:server:war:7.0-RC-5<br />\- fr.ird.observe:services-topia:jar:7.0-RC-5:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.33:compile<br />      \- asm:asm:jar:3.3:compile<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:server:war:7.0-RC-6-SNAPSHOT<br />\- fr.ird.observe:services:jar:7.0-RC-6-SNAPSHOT:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.33:compile<br />      \- asm:asm:jar:3.3:compile<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">3.3.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:server:war:7.0-RC-5<br />\- org.debux.webmotion:webmotion:jar:2.5.3:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      \- asm:asm-tree:jar:3.3.1:compile<br />         \- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:server:war:7.0-RC-6-SNAPSHOT<br />\- org.debux.webmotion:webmotion:jar:2.5.3:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      \- asm:asm-tree:jar:3.3.1:compile<br />         \- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="asm:asm-tree"></a>asm:asm-tree</h4> <table border="0" class="table table-striped"> @@ -153,56 +153,12 @@ <td width="25%">3.3</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:server:war:7.0-RC-5<br />\- fr.ird.observe:services-topia:jar:7.0-RC-5:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.33:compile<br />      \- asm:asm-commons:jar:3.3:compile<br />         \- (asm:asm-tree:jar:3.3:compile - omitted for conflict with 3.3.1)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:server:war:7.0-RC-6-SNAPSHOT<br />\- fr.ird.observe:services:jar:7.0-RC-6-SNAPSHOT:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.33:compile<br />      \- asm:asm-commons:jar:3.3:compile<br />         \- (asm:asm-tree:jar:3.3:compile - omitted for conflict with 3.3.1)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.3.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:server:war:7.0-RC-5<br />\- org.debux.webmotion:webmotion:jar:2.5.3:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- asm:asm-util:jar:3.3.1:compile<br />      |  \- (asm:asm-tree:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      +- asm:asm-tree:jar:3.3.1:compile<br />      \- asm:asm-analysis:jar:3.3.1:compile<br />         \- (asm:asm-tree:jar:3.3.1:compile - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> -<div class="section"> -<h4><a name="org.codehaus.plexus:plexus-component-annotations"></a>org.codehaus.plexus:plexus-component-annotations</h4> -<table border="0" class="table table-striped"> -<tr class="a"> -<td><img alt="[Error]" src="images/icon_error_sml.gif" /></td> -<td> -<table border="0" class="table table-striped"> -<tr class="b"> -<td width="25%">1.5.5</td> -<td> -<ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-5<br />\- org.apache.maven:maven-plugin-api:jar:3.5.0:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.3:compile<br />      \- (org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile - omitted for conflict with 1.7.1)<br /></li><br /></ol></td></tr> -<tr class="a"> -<td width="25%">1.7.1</td> -<td> -<ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-5<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.apache.maven.shared:maven-dependency-tree:jar:3.0:compile<br />|     \- org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile<br />+- org.apache.maven:maven-core:jar:3.5.0:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  +- org.apache.maven:maven-model-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  +- org.apache.maven:maven-resolver-provider:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile - scope updated from provided; omitted for duplicate)<br />\- org.apache.maven:maven-compat:jar:3.5.0:provided<br />   \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile - scope updated from provided; omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> -<div class="section"> -<h4><a name="org.codehaus.plexus:plexus-utils"></a>org.codehaus.plexus:plexus-utils</h4> -<table border="0" class="table table-striped"> -<tr class="b"> -<td><img alt="[Error]" src="images/icon_error_sml.gif" /></td> -<td> -<table border="0" class="table table-striped"> -<tr class="a"> -<td width="25%">1.5.5</td> -<td> -<ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-5<br />\- org.apache.maven:maven-core:jar:3.5.0:provided<br />   \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.4:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:1.5.5:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> -<tr class="b"> -<td width="25%">3.0.17</td> -<td> -<ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-5<br />\- org.apache.maven:maven-plugin-api:jar:3.5.0:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.3:compile<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.17:compile - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> -<tr class="a"> -<td width="25%">3.0.22</td> -<td> -<ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-5<br />\- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />   \- org.codehaus.plexus:plexus-utils:jar:3.0.22:compile<br /></li><br /></ol></td></tr> -<tr class="b"> -<td width="25%">3.0.24</td> -<td> -<ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-5<br />+- org.apache.maven:maven-core:jar:3.5.0:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.5.0:provided<br />|  |  +- org.apache.maven:maven-builder-support:jar:3.5.0:provided<br />|  |  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-repository-metadata:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-model-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-resolver-provider:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-compat:jar:3.5.0:provided<br />|  +- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  \- org.apache.maven.wagon:wagon-provider-api:jar:2.12:provided<br />|     \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-model:jar:3.5.0:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-settings:jar:3.5.0:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />\- org.apache.maven:maven-artifact:jar:3.5.0:provided<br />   \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr></table></td></tr></table></div></div> +<li>fr.ird.observe:server:war:7.0-RC-6-SNAPSHOT<br />\- org.debux.webmotion:webmotion:jar:2.5.3:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- asm:asm-util:jar:3.3.1:compile<br />      |  \- (asm:asm-tree:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      +- asm:asm-tree:jar:3.3.1:compile<br />      \- asm:asm-analysis:jar:3.3.1:compile<br />         \- (asm:asm-tree:jar:3.3.1:compile - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div></div> </div> </div> </div> ===================================== dependency-info.html ===================================== --- a/dependency-info.html +++ b/dependency-info.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Informations de dépendance</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Informations de dépendance</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -98,31 +98,31 @@ <div class="source"><pre class="prettyprint linenums"><dependency> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5</version> + <version>7.0-RC-6-SNAPSHOT</version> <type>pom</type> </dependency></pre></div></div> <div class="section"> <h3><a name="Apache_Buildr"></a>Apache Buildr</h3><a name="Apache_Buildr"></a> -<div class="source"><pre class="prettyprint linenums">'fr.ird.observe:ird-observe:pom:7.0-RC-5'</pre></div></div> +<div class="source"><pre class="prettyprint linenums">'fr.ird.observe:ird-observe:pom:7.0-RC-6-SNAPSHOT'</pre></div></div> <div class="section"> <h3><a name="Apache_Ivy"></a>Apache Ivy</h3><a name="Apache_Ivy"></a> -<div class="source"><pre class="prettyprint linenums"><dependency org="fr.ird.observe" name="ird-observe" rev="7.0-RC-5"> +<div class="source"><pre class="prettyprint linenums"><dependency org="fr.ird.observe" name="ird-observe" rev="7.0-RC-6-SNAPSHOT"> <artifact name="ird-observe" type="pom" /> </dependency></pre></div></div> <div class="section"> <h3><a name="Groovy_Grape"></a>Groovy Grape</h3><a name="Groovy_Grape"></a> <div class="source"><pre class="prettyprint linenums">@Grapes( -@Grab(group='fr.ird.observe', module='ird-observe', version='7.0-RC-5') +@Grab(group='fr.ird.observe', module='ird-observe', version='7.0-RC-6-SNAPSHOT') )</pre></div></div> <div class="section"> <h3><a name="GradleGrails"></a>Gradle/Grails</h3><a name="GradleGrails"></a> -<div class="source"><pre class="prettyprint linenums">compile 'fr.ird.observe:ird-observe:7.0-RC-5'</pre></div></div> +<div class="source"><pre class="prettyprint linenums">compile 'fr.ird.observe:ird-observe:7.0-RC-6-SNAPSHOT'</pre></div></div> <div class="section"> <h3><a name="Scala_SBT"></a>Scala SBT</h3><a name="Scala_SBT"></a> -<div class="source"><pre class="prettyprint linenums">libraryDependencies += "fr.ird.observe" % "ird-observe" % "7.0-RC-5"</pre></div></div> +<div class="source"><pre class="prettyprint linenums">libraryDependencies += "fr.ird.observe" % "ird-observe" % "7.0-RC-6-SNAPSHOT"</pre></div></div> <div class="section"> <h3><a name="Leiningen"></a>Leiningen</h3><a name="Leiningen"></a> -<div class="source"><pre class="prettyprint linenums">[fr.ird.observe/ird-observe "7.0-RC-5"]</pre></div></div></div> +<div class="source"><pre class="prettyprint linenums">[fr.ird.observe/ird-observe "7.0-RC-6-SNAPSHOT"]</pre></div></div></div> </div> </div> </div> ===================================== dependency-management.html ===================================== --- a/dependency-management.html +++ b/dependency-management.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Gestion des dépendances du project</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Gestion des dépendances du project</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -182,6 +182,18 @@ <td>jar</td> <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr> <tr class="a"> +<td>fr.ird.observe.toolkit</td> +<td><a class="externalLink" href="https://ultreiaio.gitlab.io/ird-observe-toolkit/topia-extension">topia-extension</a></td> +<td>1.0</td> +<td>jar</td> +<td><a class="externalLink" href="http://www.gnu.org/licenses/gpl.txt">General Public License (GPL)</a></td></tr> +<tr class="b"> +<td>fr.ird.observe.toolkit</td> +<td><a class="externalLink" href="https://ultreiaio.gitlab.io/ird-observe-toolkit/topia-templates-extension">topia-templates-extension</a></td> +<td>1.0</td> +<td>jar</td> +<td><a class="externalLink" href="http://www.gnu.org/licenses/gpl.txt">General Public License (GPL)</a></td></tr> +<tr class="a"> <td>io.ultreia.java4all.eugene</td> <td><a class="externalLink" href="http://eugene.nuiton.org/eugene">eugene</a></td> <td>3.0-alpha-11</td> @@ -208,91 +220,91 @@ <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-runtime">jaxx-runtime</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-runtime-swing-application">jaxx-runtime-swing-application</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-runtime-swing-session">jaxx-runtime-swing-session</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-runtime-swing-wizard">jaxx-runtime-swing-wizard</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-validator">jaxx-validator</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-about">jaxx-widgets-about</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-config">jaxx-widgets-config</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-datetime">jaxx-widgets-datetime</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-error">jaxx-widgets-error</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-file">jaxx-widgets-file</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-gis">jaxx-widgets-gis</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-hidor">jaxx-widgets-hidor</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-number">jaxx-widgets-number</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-select">jaxx-widgets-select</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-status">jaxx-widgets-status</a></td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> @@ -364,13 +376,13 @@ <tr class="a"> <td>org.hibernate</td> <td><a class="externalLink" href="http://hibernate.org">hibernate-core</a></td> -<td>5.1.8.Final</td> +<td>5.1.9.Final</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-2.1.html">GNU Lesser General Public License</a></td></tr> <tr class="b"> <td>org.hibernate</td> <td><a class="externalLink" href="http://hibernate.org">hibernate-hikaricp</a></td> -<td>5.1.8.Final</td> +<td>5.1.9.Final</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-2.1.html">GNU Lesser General Public License</a></td></tr> <tr class="a"> @@ -441,10 +453,10 @@ <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>org.postgresql</td> -<td><a class="externalLink" href="https://github.com/pgjdbc/pgjdbc-parent-poms/pgjdbc-core-parent/pgjdbc-core…">postgresql</a></td> -<td>42.1.3.jre7</td> +<td><a class="externalLink" href="https://github.com/pgjdbc/pgjdbc">postgresql</a></td> +<td>42.1.4</td> <td>jar</td> -<td><a class="externalLink" href="http://www.postgresql.org/about/licence/">The PostgreSQL License</a></td></tr> +<td><a class="externalLink" href="https://jdbc.postgresql.org/about/license.html">BSD-2-Clause</a></td></tr> <tr class="a"> <td>org.reflections</td> <td><a class="externalLink" href="http://github.com/ronmamo/reflections">reflections</a></td> ===================================== dependency-updates-report.html ===================================== --- a/dependency-updates-report.html +++ b/dependency-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Dependency Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Dependency Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,15 +101,15 @@ <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of dependencies where the next version available is smaller than an incremental version update</td> -<td>1</td></tr> +<td>2</td></tr> <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of dependencies where the next version available is an incremental version update</td> -<td>6</td></tr> +<td>5</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of dependencies where the next version available is a minor version update</td> -<td>0</td></tr> +<td>2</td></tr> <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of dependencies where the next version available is a major version update</td> @@ -164,7 +164,7 @@ <td><b>22.0-android</b></td> <td></td> <td><b>23.0-rc1</b></td> -<td></td></tr> +<td><b>23.0</b></td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>com.h2database</td> @@ -190,7 +190,7 @@ <td></td> <td></td></tr> <tr class="b"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>com.vladsch.flexmark</td> <td>flexmark</td> <td>0.22.18</td> @@ -198,11 +198,11 @@ <td></td> <td>jar</td> <td></td> -<td></td> +<td><b>0.22.20</b></td> <td></td> <td></td></tr> <tr class="a"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>com.vladsch.flexmark</td> <td>flexmark-util</td> <td>0.22.18</td> @@ -210,7 +210,7 @@ <td></td> <td>jar</td> <td></td> -<td></td> +<td><b>0.22.20</b></td> <td></td> <td></td></tr> <tr class="b"> @@ -287,6 +287,30 @@ <td></td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> +<td>fr.ird.observe.toolkit</td> +<td>topia-extension</td> +<td>1.0</td> +<td></td> +<td></td> +<td>jar</td> +<td></td> +<td></td> +<td></td> +<td></td></tr> +<tr class="a"> +<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td>fr.ird.observe.toolkit</td> +<td>topia-templates-extension</td> +<td>1.0</td> +<td></td> +<td></td> +<td>jar</td> +<td></td> +<td></td> +<td></td> +<td></td></tr> +<tr class="b"> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.eugene</td> <td>eugene</td> <td>3.0-alpha-11</td> @@ -337,7 +361,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-runtime</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -349,7 +373,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-runtime-swing-application</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -361,7 +385,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-runtime-swing-session</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -373,7 +397,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-runtime-swing-wizard</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -385,7 +409,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-validator</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -397,7 +421,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-about</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -409,7 +433,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-config</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -421,7 +445,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-datetime</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -433,7 +457,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-error</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -445,7 +469,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-file</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -457,7 +481,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-gis</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -469,7 +493,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-hidor</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -481,7 +505,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-number</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -493,7 +517,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-select</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td>compile</td> <td></td> <td>jar</td> @@ -505,7 +529,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-status</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td></td> <td></td> <td>jar</td> @@ -757,24 +781,24 @@ <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>org.hibernate</td> <td>hibernate-core</td> -<td>5.1.8.Final</td> +<td>5.1.9.Final</td> <td></td> <td></td> <td>jar</td> <td></td> -<td><b>5.1.9.Final</b></td> +<td></td> <td><b>5.2.0.Final</b></td> <td></td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>org.hibernate</td> <td>hibernate-hikaricp</td> -<td>5.1.8.Final</td> +<td>5.1.9.Final</td> <td></td> <td></td> <td>jar</td> <td></td> -<td><b>5.1.9.Final</b></td> +<td></td> <td><b>5.2.0.Final</b></td> <td></td></tr> <tr class="a"> @@ -925,12 +949,12 @@ <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>org.postgresql</td> <td>postgresql</td> -<td>42.1.3.jre7</td> +<td>42.1.4</td> <td></td> <td></td> <td>jar</td> +<td><b>42.1.4.jre6</b></td> <td></td> -<td><b>42.1.4</b></td> <td></td> <td></td></tr> <tr class="b"> @@ -1136,7 +1160,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>22.0-android</b> <i>Next Version</i><br /><b>23.0-rc1</b> <i>Next Minor</i><br /><b>23.0-rc1-android</b> <i>Latest Minor</i></td></tr></table></div> +<td><b>22.0-android</b> <i>Next Version</i><br /><b>23.0-rc1</b> <i>Next Minor</i><br /><b>23.0-rc1-android</b> <i>Latest Minor</i><br /><b>23.0</b> <i>Next Major</i><br /><b>23.0-android</b> <i>Latest Major</i></td></tr></table></div> <div class="section"> <h3><a name="com.h2database:h2"></a>com.h2database:h2</h3> <table border="0" class="table table-striped"> @@ -1190,7 +1214,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>com.vladsch.flexmark</td></tr> @@ -1208,13 +1232,16 @@ <td></td></tr> <tr class="a"> <th width="80%">Type</th> -<td>jar</td></tr></table></div> +<td>jar</td></tr> +<tr class="b"> +<th width="80%">Newer versions</th> +<td><b>0.22.20</b> <i>Next Incremental</i><br />0.22.22<br /><b>0.22.24</b> <i>Latest Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="com.vladsch.flexmark:flexmark-util"></a>com.vladsch.flexmark:flexmark-util</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>com.vladsch.flexmark</td></tr> @@ -1232,7 +1259,10 @@ <td></td></tr> <tr class="a"> <th width="80%">Type</th> -<td>jar</td></tr></table></div> +<td>jar</td></tr> +<tr class="b"> +<th width="80%">Newer versions</th> +<td><b>0.22.20</b> <i>Next Incremental</i><br />0.22.22<br /><b>0.22.24</b> <i>Latest Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="com.zaxxer:HikariCP"></a>com.zaxxer:HikariCP</h3> <table border="0" class="table table-striped"> @@ -1381,6 +1411,54 @@ <th width="80%">Type</th> <td>jar</td></tr></table></div> <div class="section"> +<h3><a name="fr.ird.observe.toolkit:topia-extension"></a>fr.ird.observe.toolkit:topia-extension</h3> +<table border="0" class="table table-striped"> +<tr class="a"> +<th width="80%">Status</th> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<tr class="b"> +<th width="80%">Group Id</th> +<td>fr.ird.observe.toolkit</td></tr> +<tr class="a"> +<th width="80%">Artifact Id</th> +<td>topia-extension</td></tr> +<tr class="b"> +<th width="80%">Current Version</th> +<td>1.0</td></tr> +<tr class="a"> +<th width="80%">Scope</th> +<td></td></tr> +<tr class="b"> +<th width="80%">Classifier</th> +<td></td></tr> +<tr class="a"> +<th width="80%">Type</th> +<td>jar</td></tr></table></div> +<div class="section"> +<h3><a name="fr.ird.observe.toolkit:topia-templates-extension"></a>fr.ird.observe.toolkit:topia-templates-extension</h3> +<table border="0" class="table table-striped"> +<tr class="a"> +<th width="80%">Status</th> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<tr class="b"> +<th width="80%">Group Id</th> +<td>fr.ird.observe.toolkit</td></tr> +<tr class="a"> +<th width="80%">Artifact Id</th> +<td>topia-templates-extension</td></tr> +<tr class="b"> +<th width="80%">Current Version</th> +<td>1.0</td></tr> +<tr class="a"> +<th width="80%">Scope</th> +<td></td></tr> +<tr class="b"> +<th width="80%">Classifier</th> +<td></td></tr> +<tr class="a"> +<th width="80%">Type</th> +<td>jar</td></tr></table></div> +<div class="section"> <h3><a name="io.ultreia.java4all.eugene:eugene"></a>io.ultreia.java4all.eugene:eugene</h3> <table border="0" class="table table-striped"> <tr class="a"> @@ -1490,7 +1568,7 @@ <td>jaxx-runtime</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1514,7 +1592,7 @@ <td>jaxx-runtime-swing-application</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1538,7 +1616,7 @@ <td>jaxx-runtime-swing-session</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1562,7 +1640,7 @@ <td>jaxx-runtime-swing-wizard</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1586,7 +1664,7 @@ <td>jaxx-validator</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1610,7 +1688,7 @@ <td>jaxx-widgets-about</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1634,7 +1712,7 @@ <td>jaxx-widgets-config</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1658,7 +1736,7 @@ <td>jaxx-widgets-datetime</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1682,7 +1760,7 @@ <td>jaxx-widgets-error</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1706,7 +1784,7 @@ <td>jaxx-widgets-file</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1730,7 +1808,7 @@ <td>jaxx-widgets-gis</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1754,7 +1832,7 @@ <td>jaxx-widgets-hidor</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1778,7 +1856,7 @@ <td>jaxx-widgets-number</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1802,7 +1880,7 @@ <td>jaxx-widgets-select</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1826,7 +1904,7 @@ <td>jaxx-widgets-status</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Scope</th> <td></td></tr> @@ -2324,7 +2402,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.hibernate</td></tr> @@ -2333,7 +2411,7 @@ <td>hibernate-core</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>5.1.8.Final</td></tr> +<td>5.1.9.Final</td></tr> <tr class="a"> <th width="80%">Scope</th> <td></td></tr> @@ -2345,13 +2423,13 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>5.1.9.Final</b> <i>Next Incremental</i><br /><b>5.2.0.Final</b> <i>Next Minor</i><br />5.2.1.Final<br />5.2.2.Final<br />5.2.3.Final<br />5.2.4.Final<br />5.2.5.Final<br />5.2.6.Final<br />5.2.7.Final<br />5.2.8.Final<br />5.2.9.Final<br /><b>5.2.10.Final</b> <i>Latest Minor</i></td></tr></table></div> +<td><b>5.2.0.Final</b> <i>Next Minor</i><br />5.2.1.Final<br />5.2.2.Final<br />5.2.3.Final<br />5.2.4.Final<br />5.2.5.Final<br />5.2.6.Final<br />5.2.7.Final<br />5.2.8.Final<br />5.2.9.Final<br /><b>5.2.10.Final</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.hibernate:hibernate-hikaricp"></a>org.hibernate:hibernate-hikaricp</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.hibernate</td></tr> @@ -2360,7 +2438,7 @@ <td>hibernate-hikaricp</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>5.1.8.Final</td></tr> +<td>5.1.9.Final</td></tr> <tr class="a"> <th width="80%">Scope</th> <td></td></tr> @@ -2372,7 +2450,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>5.1.9.Final</b> <i>Next Incremental</i><br /><b>5.2.0.Final</b> <i>Next Minor</i><br />5.2.1.Final<br />5.2.2.Final<br />5.2.3.Final<br />5.2.4.Final<br />5.2.5.Final<br />5.2.6.Final<br />5.2.7.Final<br />5.2.8.Final<br />5.2.9.Final<br /><b>5.2.10.Final</b> <i>Latest Minor</i></td></tr></table></div> +<td><b>5.2.0.Final</b> <i>Next Minor</i><br />5.2.1.Final<br />5.2.2.Final<br />5.2.3.Final<br />5.2.4.Final<br />5.2.5.Final<br />5.2.6.Final<br />5.2.7.Final<br />5.2.8.Final<br />5.2.9.Final<br /><b>5.2.10.Final</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.javassist:javassist"></a>org.javassist:javassist</h3> <table border="0" class="table table-striped"> @@ -2666,7 +2744,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer version available.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.postgresql</td></tr> @@ -2675,7 +2753,7 @@ <td>postgresql</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>42.1.3.jre7</td></tr> +<td>42.1.4</td></tr> <tr class="a"> <th width="80%">Scope</th> <td></td></tr> @@ -2687,7 +2765,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>42.1.4</b> <i>Next Incremental</i><br />42.1.4.jre6<br /><b>42.1.4.jre7</b> <i>Latest Incremental</i></td></tr></table></div> +<td><b>42.1.4.jre6</b> <i>Next Version</i><br />42.1.4.jre7</td></tr></table></div> <div class="section"> <h3><a name="org.reflections:reflections"></a>org.reflections:reflections</h3> <table border="0" class="table table-striped"> ===================================== dev-activity.html ===================================== --- a/dev-activity.html +++ b/dev-activity.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Developer Activity Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Developer Activity Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -93,8 +93,8 @@ <div class="section"> <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> -<h3><a name="Changes_between_2017-07-03_and_2017-08-03"></a>Changes between 2017-07-03 and 2017-08-03</h3> -<p>Total commits: 120<br />Total number of files changed: 4230</p> +<h3><a name="Changes_between_2017-07-07_and_2017-08-07"></a>Changes between 2017-07-07 and 2017-08-07</h3> +<p>Total commits: 149<br />Total number of files changed: 5242</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> @@ -102,12 +102,12 @@ <th>Total Number of Files Changed</th></tr> <tr class="b"> <td>166231 <dev(a)tchemit.fr></td> -<td>19</td> +<td>22</td> <td>26</td></tr> <tr class="a"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>92</td> -<td>4203</td></tr> +<td>118</td> +<td>5221</td></tr> <tr class="b"> <td>Tony Chemit <dev(a)tchemit.fr></td> <td>9</td> ===================================== file-activity.html ===================================== The diff for this file was not included because it is too large. ===================================== index.html ===================================== --- a/index.html +++ b/index.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== --- a/install-serverPG.html +++ b/install-serverPG.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== --- a/install.html +++ b/install.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== integration.html ===================================== --- a/integration.html +++ b/integration.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Intégration continue</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Intégration continue</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== issue-tracking.html ===================================== --- a/issue-tracking.html +++ b/issue-tracking.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Contrôle des livraisons</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Contrôle des livraisons</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== license.html ===================================== --- a/license.html +++ b/license.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Licence du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Licence du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== plugin-management.html ===================================== --- a/plugin-management.html +++ b/plugin-management.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Gestion des plugins du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Gestion des plugins du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -121,7 +121,7 @@ <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-maven-plugin">jaxx-maven-plugin</a></td> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="b"> <td>io.ultreia.maven</td> <td><a class="externalLink" href="https://ultreiaio.gitlab.io/gitlab-maven-plugin">gitlab-maven-plugin</a></td> ===================================== plugin-updates-report.html ===================================== --- a/plugin-updates-report.html +++ b/plugin-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Plugin Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Plugin Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -105,7 +105,7 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is an incremental version update</td> -<td>2</td></tr> +<td>3</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is a minor version update</td> @@ -132,12 +132,12 @@ <th>Next Major</th> <th>Dependency status</th></tr> <tr class="b"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>com.akathist.maven.plugins.launch4j</td> <td>launch4j-maven-plugin</td> -<td><b>1.7.18</b></td> -<td></td> +<td>1.7.18</td> <td></td> +<td><b>1.7.19</b></td> <td></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> @@ -185,7 +185,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-maven-plugin</td> -<td><b>3.0-alpha-9</b></td> +<td><b>3.0-alpha-10</b></td> <td></td> <td></td> <td></td> @@ -723,25 +723,58 @@ <th>Dependency status</th></tr></table></div> <div class="section"> <h3><a name="Plugins"></a>Plugins</h3> -<p>This project does not declare any plugins in a build/plugins section.</p></div></div> +<table border="0" class="table table-striped"> +<tr class="a"> +<th>Status</th> +<th>Group Id</th> +<th>Artifact Id</th> +<th>Current Version</th> +<th>Next Version</th> +<th>Next Incremental</th> +<th>Next Minor</th> +<th>Next Major</th> +<th>Dependency status</th></tr> +<tr class="b"> +<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td>fr.ird.observe.toolkit</td> +<td>toolbox-maven-plugin</td> +<td><b>1.0</b></td> +<td></td> +<td></td> +<td></td> +<td></td> +<td><img src="images/icon_success_sml.gif" alt="" /></td></tr> +<tr class="a"> +<th>Status</th> +<th>Group Id</th> +<th>Artifact Id</th> +<th>Current Version</th> +<th>Next Version</th> +<th>Next Incremental</th> +<th>Next Minor</th> +<th>Next Major</th> +<th>Dependency status</th></tr></table></div></div> <div class="section"> <h2><a name="Plugin_Updates"></a>Plugin Updates</h2> <p></p> <div class="section"> <h3><a name="Plugin_com.akathist.maven.plugins.launch4j:launch4j-maven-plugin"></a>Plugin com.akathist.maven.plugins.launch4j:launch4j-maven-plugin</h3> <table border="0" class="table table-striped"> -<tr class="a"> -<th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> <tr class="b"> +<th width="80%">Status</th> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<tr class="a"> <th width="80%">Group Id</th> <td>com.akathist.maven.plugins.launch4j</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Artifact Id</th> <td>launch4j-maven-plugin</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Current Version</th> -<td>1.7.18</td></tr></table></div> +<td>1.7.18</td></tr> +<tr class="b"> +<th width="80%">Newer versions</th> +<td><b>1.7.19</b> <i>Next Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="Plugin_external.atlassian.jgitflow:jgitflow-maven-plugin"></a>Plugin external.atlassian.jgitflow:jgitflow-maven-plugin</h3> <table border="0" class="table table-striped"> @@ -758,6 +791,21 @@ <th width="80%">Current Version</th> <td>1.0-m5.1</td></tr></table></div> <div class="section"> +<h3><a name="Plugin_fr.ird.observe.toolkit:toolbox-maven-plugin"></a>Plugin fr.ird.observe.toolkit:toolbox-maven-plugin</h3> +<table border="0" class="table table-striped"> +<tr class="a"> +<th width="80%">Status</th> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<tr class="b"> +<th width="80%">Group Id</th> +<td>fr.ird.observe.toolkit</td></tr> +<tr class="a"> +<th width="80%">Artifact Id</th> +<td>toolbox-maven-plugin</td></tr> +<tr class="b"> +<th width="80%">Current Version</th> +<td>1.0</td></tr></table></div> +<div class="section"> <h3><a name="Plugin_io.ultreia.java4all.eugene:eugene-maven-plugin"></a>Plugin io.ultreia.java4all.eugene:eugene-maven-plugin</h3> <table border="0" class="table table-striped"> <tr class="a"> @@ -816,7 +864,7 @@ <td>jaxx-maven-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr></table></div> +<td>3.0-alpha-10</td></tr></table></div> <div class="section"> <h3><a name="Plugin_io.ultreia.maven:gitlab-maven-plugin"></a>Plugin io.ultreia.maven:gitlab-maven-plugin</h3> <table border="0" class="table table-striped"> @@ -1222,7 +1270,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-gis</td> -<td>3.0-alpha-9</td> +<td>3.0-alpha-10</td> <td></td> <td>jar</td> <td></td> @@ -1287,7 +1335,7 @@ <td>jaxx-widgets-gis</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Classifier</th> <td></td></tr> ===================================== plugins.html ===================================== --- a/plugins.html +++ b/plugins.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Project Plugins</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Project Plugins</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -99,62 +99,66 @@ <th>ArtifactId</th> <th>Version</th></tr> <tr class="b"> +<td>fr.ird.observe.toolkit</td> +<td><a class="externalLink" href="https://ultreiaio.gitlab.io/ird-observe-toolkit/toolbox-maven-plugin">toolbox-maven-plugin</a></td> +<td>1.0</td></tr> +<tr class="a"> <td>io.ultreia.maven</td> <td><a class="externalLink" href="https://ultreiaio.gitlab.io/gitlab-maven-plugin">gitlab-maven-plugin</a></td> <td>1.0.9</td></tr> -<tr class="a"> +<tr class="b"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="http://maven.apache.org/plugins/maven-antrun-plugin/">maven-antrun-plugin</a></td> <td>1.8</td></tr> -<tr class="b"> +<tr class="a"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="http://maven.apache.org/plugins/maven-clean-plugin/">maven-clean-plugin</a></td> <td>3.0.0</td></tr> -<tr class="a"> +<tr class="b"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="https://maven.apache.org/plugins/maven-dependency-plugin/">maven-dependency-plugin</a></td> <td>3.0.1</td></tr> -<tr class="b"> +<tr class="a"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="http://maven.apache.org/plugins/maven-deploy-plugin/">maven-deploy-plugin</a></td> <td>2.8.2</td></tr> -<tr class="a"> +<tr class="b"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="http://maven.apache.org/enforcer/maven-enforcer-plugin">maven-enforcer-plugin</a></td> <td>1.4.1</td></tr> -<tr class="b"> +<tr class="a"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="http://maven.apache.org/plugins/maven-gpg-plugin/">maven-gpg-plugin</a></td> <td>1.6</td></tr> -<tr class="a"> +<tr class="b"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="http://maven.apache.org/plugins/maven-install-plugin/">maven-install-plugin</a></td> <td>2.5.2</td></tr> -<tr class="b"> +<tr class="a"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="http://maven.apache.org/plugins/maven-javadoc-plugin/">maven-javadoc-plugin</a></td> <td>2.10.4</td></tr> -<tr class="a"> +<tr class="b"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="https://maven.apache.org/plugins/maven-site-plugin/">maven-site-plugin</a></td> <td>3.6</td></tr> -<tr class="b"> +<tr class="a"> <td>org.apache.maven.plugins</td> <td><a class="externalLink" href="https://maven.apache.org/plugins/maven-source-plugin/">maven-source-plugin</a></td> <td>3.0.1</td></tr> -<tr class="a"> +<tr class="b"> <td>org.codehaus.mojo</td> <td><a class="externalLink" href="http://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin">animal-sniffer-maven-plugin</a></td> <td>1.15</td></tr> -<tr class="b"> +<tr class="a"> <td>org.codehaus.mojo</td> <td><a class="externalLink" href="http://www.mojohaus.org/buildnumber-maven-plugin/buildnumber-maven-plugin">buildnumber-maven-plugin</a></td> <td>1.4</td></tr> -<tr class="a"> +<tr class="b"> <td>org.codehaus.mojo</td> <td><a class="externalLink" href="http://www.mojohaus.org/license-maven-plugin">license-maven-plugin</a></td> <td>1.13</td></tr> -<tr class="b"> +<tr class="a"> <td>org.nuiton</td> <td><a class="externalLink" href="http://maven-helper-plugin.nuiton.org/helper-maven-plugin">helper-maven-plugin</a></td> <td>2.3.2</td></tr></table></div> ===================================== project-info.html ===================================== --- a/project-info.html +++ b/project-info.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Information générale du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Information générale du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== project-reports.html ===================================== --- a/project-reports.html +++ b/project-reports.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Rapports générés par Maven</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Rapports générés par Maven</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== project-summary.html ===================================== --- a/project-summary.html +++ b/project-summary.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Résumé du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Résumé du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -134,7 +134,7 @@ <td>ird-observe</td></tr> <tr class="b"> <td>Version</td> -<td>7.0-RC-5</td></tr> +<td>7.0-RC-6-SNAPSHOT</td></tr> <tr class="a"> <td>Type</td> <td>pom</td></tr></table></div></div> ===================================== property-updates-report.html ===================================== --- a/property-updates-report.html +++ b/property-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Property Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Property Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -109,7 +109,7 @@ <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of properties where the next version available is a minor version update</td> -<td>0</td></tr> +<td>1</td></tr> <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of properties where the next version available is a major version update</td> @@ -156,7 +156,7 @@ <td><b>22.0-android</b></td> <td></td> <td><b>23.0-rc1</b></td> -<td></td></tr> +<td><b>23.0</b></td></tr> <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${reflectionsVersion}</td> @@ -192,9 +192,9 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>${hibernateVersion}</td> -<td>5.1.8.Final</td> +<td>5.1.9.Final</td> +<td></td> <td></td> -<td><b>5.1.9.Final</b></td> <td><b>5.2.0.Final</b></td> <td></td></tr> <tr class="b"> @@ -223,21 +223,29 @@ <td></td></tr> <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> -<td>${jaxxVersion}</td> -<td>3.0-alpha-9</td> +<td>${observeToolkitVersion}</td> +<td>1.0</td> <td></td> <td></td> <td></td> <td></td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> +<td>${jaxxVersion}</td> +<td>3.0-alpha-10</td> +<td></td> +<td></td> +<td></td> +<td></td></tr> +<tr class="a"> +<td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${nuitonConverterVersion}</td> <td>1.0</td> <td></td> <td></td> <td></td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${swingXVersion}</td> <td>1.6.5-1</td> @@ -245,7 +253,7 @@ <td></td> <td></td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${mavenVersion}</td> <td>3.5.0</td> @@ -253,7 +261,7 @@ <td></td> <td></td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${processorPluginVersion}</td> <td>1.3</td> @@ -261,7 +269,7 @@ <td></td> <td></td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${webmotionVersion}</td> <td>2.5.3</td> @@ -269,7 +277,7 @@ <td></td> <td></td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${nuitonI18nVersion}</td> <td>4.0-alpha-3</td> @@ -277,7 +285,7 @@ <td></td> <td></td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${xworkVersion}</td> <td>2.3.33</td> @@ -285,15 +293,15 @@ <td></td> <td></td> <td></td></tr> -<tr class="a"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<tr class="b"> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>${flexmarkVersion}</td> <td>0.22.18</td> <td></td> -<td></td> +<td><b>0.22.20</b></td> <td></td> <td></td></tr> -<tr class="b"> +<tr class="a"> <th>Status</th> <th>Property</th> <th>Current Version</th> @@ -307,31 +315,31 @@ <div class="section"> <h3><a name="aeugenePluginVersion"></a>${eugenePluginVersion</h3> <table border="0" class="table table-striped"> -<tr class="a"> +<tr class="b"> <th width="80%">Status</th> <td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Property</th> <td>${eugenePluginVersion}</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Associated artifacts</th> <td>io.ultreia.java4all.eugene:eugene<br />io.ultreia.java4all.eugene:eugene-maven-plugin</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Current Version</th> <td>3.0-alpha-11</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Infer associations from project</th> <td>Yes</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Only use release versions</th> <td>No</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Include projects from reactor</th> <td>Yes</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Always use reactor projects (even if older or -SNAPSHOT)</th> <td>Yes</td></tr></table></div> <div class="section"> @@ -339,7 +347,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> <tr class="b"> <th width="80%">Property</th> <td>${flexmarkVersion}</td></tr> @@ -350,18 +358,21 @@ <th width="80%">Current Version</th> <td>0.22.18</td></tr> <tr class="a"> +<th width="80%">Newer versions</th> +<td><b>0.22.20</b> <i>Next Incremental</i><br />0.22.22<br /><b>0.22.24</b> <i>Latest Incremental</i></td></tr> +<tr class="b"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Infer associations from project</th> <td>Yes</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Only use release versions</th> <td>No</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Include projects from reactor</th> <td>Yes</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Always use reactor projects (even if older or -SNAPSHOT)</th> <td>Yes</td></tr></table></div> <div class="section"> @@ -381,7 +392,7 @@ <td>22.0</td></tr> <tr class="a"> <th width="80%">Newer versions</th> -<td><b>22.0-android</b> <i>Next Version</i><br /><b>23.0-rc1</b> <i>Next Minor</i><br /><b>23.0-rc1-android</b> <i>Latest Minor</i></td></tr> +<td><b>22.0-android</b> <i>Next Version</i><br /><b>23.0-rc1</b> <i>Next Minor</i><br /><b>23.0-rc1-android</b> <i>Latest Minor</i><br /><b>23.0</b> <i>Next Major</i><br /><b>23.0-android</b> <i>Latest Major</i></td></tr> <tr class="b"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> @@ -402,7 +413,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> <tr class="b"> <th width="80%">Property</th> <td>${hibernateVersion}</td></tr> @@ -411,10 +422,10 @@ <td>org.hibernate:hibernate-core<br />org.hibernate:hibernate-hikaricp</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>5.1.8.Final</td></tr> +<td>5.1.9.Final</td></tr> <tr class="a"> <th width="80%">Newer versions</th> -<td><b>5.1.9.Final</b> <i>Next Incremental</i><br /><b>5.2.0.Final</b> <i>Next Minor</i><br />5.2.1.Final<br />5.2.2.Final<br />5.2.3.Final<br />5.2.4.Final<br />5.2.5.Final<br />5.2.6.Final<br />5.2.7.Final<br />5.2.8.Final<br />5.2.9.Final<br /><b>5.2.10.Final</b> <i>Latest Minor</i></td></tr> +<td><b>5.2.0.Final</b> <i>Next Minor</i><br />5.2.1.Final<br />5.2.2.Final<br />5.2.3.Final<br />5.2.4.Final<br />5.2.5.Final<br />5.2.6.Final<br />5.2.7.Final<br />5.2.8.Final<br />5.2.9.Final<br /><b>5.2.10.Final</b> <i>Latest Minor</i></td></tr> <tr class="b"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> @@ -504,7 +515,7 @@ <td>io.ultreia.java4all.jaxx:jaxx-maven-plugin<br />io.ultreia.java4all.jaxx:jaxx-runtime<br />io.ultreia.java4all.jaxx:jaxx-runtime-swing-application<br />io.ultreia.java4all.jaxx:jaxx-runtime-swing-session<br />io.ultreia.java4all.jaxx:jaxx-runtime-swing-wizard<br />io.ultreia.java4all.jaxx:jaxx-validator<br />io.ultreia.java4all.jaxx:jaxx-widgets-about<br />io.ultreia.java4all.jaxx:jaxx-widgets-config<br />io.ultreia.java4all.jaxx:jaxx-widgets-datetime<br />io.ultreia.java4all.jaxx:jaxx-widgets-error<br />io.ultreia.java4all.jaxx:jaxx-widgets-file<br />io.ultreia.java4all.jaxx:jaxx-widgets-gis<br />io.ultreia.java4all.jaxx:jaxx-widgets-gis<br />io.ultreia.java4all.jaxx:jaxx-widgets-hidor<br />io.ultreia.java4all.jaxx:jaxx-widgets-number<br />io.ultreia.java4all.jaxx:jaxx-widgets-select<br />io.ultreia.java4all.jaxx:jaxx-widgets-status</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-9</td></tr> +<td>3.0-alpha-10</td></tr> <tr class="a"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> @@ -731,6 +742,36 @@ <th width="80%">Always use reactor projects (even if older or -SNAPSHOT)</th> <td>Yes</td></tr></table></div> <div class="section"> +<h3><a name="aobserveToolkitVersion"></a>${observeToolkitVersion</h3> +<table border="0" class="table table-striped"> +<tr class="a"> +<th width="80%">Status</th> +<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<tr class="b"> +<th width="80%">Property</th> +<td>${observeToolkitVersion}</td></tr> +<tr class="a"> +<th width="80%">Associated artifacts</th> +<td>fr.ird.observe.toolkit:toolbox-maven-plugin<br />fr.ird.observe.toolkit:topia-extension<br />fr.ird.observe.toolkit:topia-templates-extension</td></tr> +<tr class="b"> +<th width="80%">Current Version</th> +<td>1.0</td></tr> +<tr class="a"> +<th width="80%">Allowed version range</th> +<td>[,)</td></tr> +<tr class="b"> +<th width="80%">Infer associations from project</th> +<td>Yes</td></tr> +<tr class="a"> +<th width="80%">Only use release versions</th> +<td>No</td></tr> +<tr class="b"> +<th width="80%">Include projects from reactor</th> +<td>Yes</td></tr> +<tr class="a"> +<th width="80%">Always use reactor projects (even if older or -SNAPSHOT)</th> +<td>Yes</td></tr></table></div> +<div class="section"> <h3><a name="aprocessorPluginVersion"></a>${processorPluginVersion</h3> <table border="0" class="table table-striped"> <tr class="a"> ===================================== sitemap.html ===================================== --- a/sitemap.html +++ b/sitemap.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Sitemap</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Sitemap</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== source-repository.html ===================================== --- a/source-repository.html +++ b/source-repository.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Dépôt de sources</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Dépôt de sources</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== team-list.html ===================================== --- a/team-list.html +++ b/team-list.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Liste des membres</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Liste des membres</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== third-party-report.html ===================================== --- a/third-party-report.html +++ b/third-party-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170802" /> + <meta name="Date-Revision-yyyymmdd" content="20170806" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Tierces parties</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Tierces parties</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-02</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-5</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-06</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-6-SNAPSHOT</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dcc51f828a3d7683f07700533ef… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dcc51f828a3d7683f07700533ef… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Create a sub project to put frameworks extensions used in ObServe (Closes #833)
by Tony CHEMIT 06 Aug '17

06 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: aa31c875 by Tony CHEMIT at 2017-08-06T21:18:11+02:00 Create a sub project to put frameworks extensions used in ObServe (Closes #833) - - - - - 25 changed files: - persistence/pom.xml - pom.xml - services-topia/pom.xml - − toolbox-maven-plugin/LICENSE.txt - − toolbox-maven-plugin/README.md - − toolbox-maven-plugin/pom.xml - − toolbox-maven-plugin/src/license/THIRD-PARTY.properties - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MergeI18nBundleMojo.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MismatchMethodParameterNameException.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MissingClassException.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MissingMethodException.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/ToolboxMojoSupport.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/ValidatorCacheRequest.java - − toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/ValidatorsCache.java - − toolbox-maven-plugin/src/main/resources/log4j.properties - − topia-extension/LICENSE.txt - − topia-extension/README.md - − topia-extension/pom.xml - − topia-extension/src/license/THIRD-PARTY.properties - − topia-extension/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaMetadataModelSupportImpl.java - − topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java - − topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aa31c875ed7a75d3e90d57b5684… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aa31c875ed7a75d3e90d57b5684… You're receiving this email because of your account on gitlab.com.

1 0