branch develop updated (2107f8a -> 2e27a48)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 2107f8a Début de la mise en place de l'arbre de navigation Merge branch 'feature/7553' into develop new 9d449cb correction du remplissage des données referentielles des combo et listes new 35287ed correction de l'ouverture de l'écran de marée (refs #7586) new d4e5353 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) new fe0a577 chargement des triplonglines (refs #7586) new 54f7e07 fix decorator(refs #7586) new 65595be fix compilation new 2e27a48 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2e27a48b00afa0384bde3a81e9fea65e8bca4557 Merge: 2107f8a 65595be Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 6 17:52:31 2015 +0200 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop commit 65595be4c187f300f9622c408d5149340939038a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 16:33:11 2015 +0200 fix compilation commit 54f7e07ed265ede21edc01962a5e20616276cdc4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 16:00:38 2015 +0200 fix decorator(refs #7586) commit fe0a5771f418e9a28b35eb892b35da0054c6481a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 15:44:22 2015 +0200 chargement des triplonglines (refs #7586) commit d4e5353cb86a56c20df54000b557914f2f3fdf52 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 12:48:17 2015 +0200 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) commit 35287edf1e4391e355cfbbee40a67bb603dd0f1e Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 12:17:54 2015 +0200 correction de l'ouverture de l'écran de marée (refs #7586) commit 9d449cbd028240dbb2163f5dd79a0ec13c291f7a Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 17:03:15 2015 +0200 correction du remplissage des données referentielles des combo et listes Summary of changes: .../observe/ObserveSwingApplicationContext.java | 10 +- .../business/db/model/DataSelectionModel.java | 345 +++++++++++---------- .../java/fr/ird/observe/ui/DecoratorService.java | 123 ++++---- .../ird/observe/ui/content/ContentUIHandler.java | 11 +- .../observe/ui/content/ContentUIInitializer.java | 215 ++++++++----- .../ird/observe/ui/content/ContentUIManager.java | 16 +- .../fr/ird/observe/ui/content/ContentUIModel.java | 5 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../content/open/impl/longline/TripLonglineUI.css | 7 +- .../ui/content/open/impl/seine/TripSeineUI.css | 6 +- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../observe/ui/storage/tabs/RolesTableModel.java | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 3 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 +- .../observe-application-swing_en_GB.properties | 8 + .../observe-application-swing_es_ES.properties | 8 + .../observe-application-swing_fr_FR.properties | 16 +- .../resources/i18n/observe-swing_fr_FR.properties | 16 +- .../v1/longline/TripLonglineServiceController.java | 5 +- .../service/longline/TripLonglineService.java | 3 +- .../java/fr/ird/observe/services/dto/FormDto.java | 7 +- .../services/dto/referential/PersonDtos.java | 48 +++ .../services/dto/referential/ReferentialDtos.java | 40 +++ .../services/dto/ObserveDtosInitializer.java | 6 +- .../service/longline/TripLonglineServiceTopia.java | 29 +- 26 files changed, 587 insertions(+), 391 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9d449cbd028240dbb2163f5dd79a0ec13c291f7a Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 17:03:15 2015 +0200 correction du remplissage des données referentielles des combo et listes --- .../java/fr/ird/observe/ui/DecoratorService.java | 1 + .../ird/observe/ui/content/ContentUIHandler.java | 11 +- .../observe/ui/content/ContentUIInitializer.java | 215 ++++++++++++++------- .../fr/ird/observe/ui/content/ContentUIModel.java | 5 +- .../java/fr/ird/observe/services/dto/FormDto.java | 7 +- 5 files changed, 160 insertions(+), 79 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index af78e48..6cc81f0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -420,6 +420,7 @@ public class DecoratorService extends DecoratorProvider { registerReferenceDtoDecorator(ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s"); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); + registerReferenceDtoDecorator(PersonDto.class, "${lastName}$s##${firstName}$s"); registerDefaultReferenceDtoDecorator(SexDto.class, libelle); //FIXME Use startDate - endDate registerDefaultReferenceDtoDecorator(FpaZoneDto.class, libelle); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index 0049a00..f771ad5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -55,6 +55,8 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.*; import java.awt.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -302,9 +304,16 @@ public abstract class ContentUIHandler<E extends IdDto> { public void initUI() throws Exception { - ContentUIInitializer<E, ObserveContentUI<E>> uiInitializer = new ContentUIInitializer<E, ObserveContentUI<E>>(ui); + final ContentUIInitializer<E, ObserveContentUI<E>> uiInitializer = new ContentUIInitializer<E, ObserveContentUI<E>>(ui); uiInitializer.initUI(); + getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM_DTO, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + uiInitializer.referentialDataUpdated(); + } + }); + } public void openUI() throws Exception { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 3aa315d..1b2c5fc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -84,6 +84,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -283,6 +284,36 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } } + public void referentialDataUpdated() { + + // initialisation des éditeurs + + for (String name : ui.get$objectMap().keySet()) { + Object o = ui.getObjectById(name); + + if (o == null) { + continue; + } + + if (o instanceof BeanComboBox<?>) { + updateData((BeanComboBox<?>) o); + continue; + } + + if (o instanceof BeanListHeader<?>) { + updateData((BeanListHeader<?>) o); + continue; + } + + if (o instanceof FilterableDoubleList<?>) { + updateData((FilterableDoubleList<?>) o); + continue; + } + + } + + } + protected void initBlockLayerUI(String... doNotBlockComponentIds) { ui.getBlockLayerUI().setAcceptedComponentTypes(ObserveMapPane.class, JScrollBar.class); ui.getBlockLayerUI().setAcceptedComponentNames(doNotBlockComponentIds); @@ -604,31 +635,15 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E Class<E> dtoClass = (Class<E>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); // init list - Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getName()); + Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); if (log.isDebugEnabled()) { log.debug("Will use decorator " + decorator); } list.putClientProperty("decorator", decorator); - List<ReferenceDto> data = null; - - if (ReferentialDto.class.isAssignableFrom(dtoClass)) { - - Predicate<ReferenceDto> predicate = (Predicate<ReferenceDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); - - ReferenceSetDto<E> referenceSetDto = getFormDto().getReferenceSetDto(dtoClass); - data = new ArrayList<>(Collections2.filter(referenceSetDto.getReference(), predicate)); -// data = tx.getDataService().getList(storageService, realEntityClass, predicate); - - } else { - data = new ArrayList<>(); - } - - // sort data from first decorator context - DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); // set datas to list and init renderer - list.init((JXPathDecorator<ReferenceDto>) decorator, data, Collections.<ReferenceDto>emptyList()); + list.init((JXPathDecorator<ReferenceDto>) decorator, Collections.<ReferenceDto>emptyList(), Collections.<ReferenceDto>emptyList()); // get the renderer initialized ListCellRenderer renderer = list.getSelectedList().getCellRenderer(); @@ -637,8 +652,6 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E list.getSelectedList().setCellRenderer(new ReferentielListCellRenderer(renderer)); list.getUniverseList().setCellRenderer(new ReferentielListCellRenderer(renderer)); - list.putClientProperty("data", data); - //FIXME // listen on cache modification // EntityDoubleListPropertyChangeListener<E> listener = @@ -647,6 +660,31 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E // service.addReferentielPropertyChangeListener(entityClass, listener); } + protected <E extends IdDto> void updateData(FilterableDoubleList list) { + Class<E> dtoClass = (Class<E>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + FormDto formDto = getFormDto(); + List<ReferenceDto> data; + + if (formDto != null && ReferentialDto.class.isAssignableFrom(dtoClass)) { + + Predicate<ReferenceDto> predicate = (Predicate<ReferenceDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); + + ReferenceSetDto<E> referenceSetDto = formDto.getReferenceSetDto(dtoClass); + data = new ArrayList<>(Collections2.filter(referenceSetDto.getReference(), predicate)); + + } else { + data = new ArrayList<>(); + } + + // sort data from first decorator context + ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); + Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); + DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); + + list.setUniverse(data); + list.putClientProperty("data", data); + } + /** * Remplit le modèle d'une liste graphique avec la liste des entités d'un * type donné sur un service de persistance donné. @@ -669,13 +707,33 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E list.putClientProperty("decorator", decorator); + // set datas to list and init renderer + list.init((JXPathDecorator<ReferenceDto>) decorator, Collections.<ReferenceDto>emptyList()); + + // get the renderer initialized + ListCellRenderer renderer = list.getList().getCellRenderer(); + + // add the specific renderer + list.getList().setCellRenderer(new ReferentielListCellRenderer(renderer)); + + //FIXME + // listen on cache modification +// EntityListPropertyChangeListener<E> listener = +// new EntityListPropertyChangeListener<E>(dtoClass, list); +// DataService service = ObserveContext.get().getDataService(); +// service.addReferentielPropertyChangeListener(entityClass, listener); + } + + protected <E extends IdDto> void updateData(BeanListHeader list) { + Class<E> dtoClass = (Class<E>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + FormDto formDto = getFormDto(); List<ReferenceDto> data; - if (ReferentialDto.class.isAssignableFrom(dtoClass)) { + if (formDto != null && ReferentialDto.class.isAssignableFrom(dtoClass)) { Predicate<ReferenceDto> predicate = (Predicate<ReferenceDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); - ReferenceSetDto<E> referenceSetDto = getFormDto().getReferenceSetDto(dtoClass); + ReferenceSetDto<E> referenceSetDto = formDto.getReferenceSetDto(dtoClass); data = new ArrayList<>(Collections2.filter(referenceSetDto.getReference(), predicate)); } else { @@ -683,25 +741,12 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } // sort data from first decorator context + ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); + Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); - // set datas to list and init renderer - list.init((JXPathDecorator<ReferenceDto>) decorator, data); - - // get the renderer initialized - ListCellRenderer renderer = list.getList().getCellRenderer(); - - // add the specific renderer - list.getList().setCellRenderer(new ReferentielListCellRenderer(renderer)); - + list.setData(data); list.putClientProperty("data", data); - - //FIXME - // listen on cache modification -// EntityListPropertyChangeListener<E> listener = -// new EntityListPropertyChangeListener<E>(dtoClass, list); -// DataService service = ObserveContext.get().getDataService(); -// service.addReferentielPropertyChangeListener(entityClass, listener); } /** @@ -719,43 +764,10 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E // init combobox Class<E> dtoClass = (Class<E>) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); - Decorator<ReferenceDto> decorator = context.getDecorator(ReferenceDto.class, dtoClass.getName()); - - Boolean noLoad = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); - - List<ReferenceDto> data = null; - - if (noLoad != null && noLoad) { - - if (log.isInfoEnabled()) { - log.info("Skip loading of entity list [" + dtoClass.getName() + "] (listNoLoad property found)"); - } - data = Collections.emptyList(); - - } else { - - // get complete data list from service - Predicate<ReferenceDto> predicate = (Predicate<ReferenceDto>) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); - - ReferenceSetDto<E> referenceSetDto = getFormDto().getReferenceSetDto(dtoClass); - data = new ArrayList<>(Collections2.filter(referenceSetDto.getReference(), predicate)); - - } - - boolean referentialEntity = ReferentialDto.class.isAssignableFrom(dtoClass); - if (referentialEntity) { - - //TC-20100208 : on ne veut pas voir les elements du referentiel non actif - ReferentialDtos.filterReferentialListByStatus((List) data); - - } - - if (log.isInfoEnabled()) { - log.info("entity list [" + dtoClass.getName() + "] : " + data.size()); - } + Decorator<ReferenceDto> decorator = context.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); // add data list to combo box - comboBox.init((JXPathDecorator<ReferenceDto>) decorator, data); + comboBox.init((JXPathDecorator<ReferenceDto>) decorator, Collections.<ReferenceDto>emptyList()); final ListCellRenderer renderer = comboBox.getCombobox().getRenderer(); @@ -781,13 +793,14 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E return comp; } }; + comboBox.getCombobox().setRenderer(toolTipRenderer); if (log.isDebugEnabled()) { log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); } - if (referentialEntity) { +// if (referentialEntity) { //FIXME // listen on cache modification @@ -803,8 +816,62 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E // }; // service.addReferentielPropertyChangeListener(entityClass, listener); +// } + + } + + protected <E extends IdDto> void updateData(BeanComboBox comboBox) { + ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); + + // init combobox + Class<E> dtoClass = (Class<E>) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + Decorator<ReferenceDto> decorator = context.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); + + Boolean noLoad = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); + + List<ReferenceDto> data = null; + FormDto formDto = getFormDto(); + + if (noLoad != null && noLoad || formDto == null) { + + if (log.isInfoEnabled()) { + log.info("Skip loading of entity list [" + dtoClass.getName() + "] (listNoLoad property found)"); + } + data = Collections.emptyList(); + + } else { + + data = new ArrayList<>(); + + // get complete data list from service + ReferenceSetDto<E> referenceSetDto = formDto.getReferenceSetDto(dtoClass); + LinkedHashSet<ReferenceDto> reference = referenceSetDto.getReference(); + + Predicate<ReferenceDto> predicate = (Predicate<ReferenceDto>) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); + + if (predicate != null) { + + data.addAll(Collections2.filter(reference, predicate)); + } else { + + data.addAll(reference); + } + + } + + boolean referentialEntity = ReferentialDto.class.isAssignableFrom(dtoClass); + if (referentialEntity) { + + //TC-20100208 : on ne veut pas voir les elements du referentiel non actif + ReferentialDtos.filterReferentialListByStatus((List) data); + + } + + if (log.isInfoEnabled()) { + log.info("entity list [" + dtoClass.getName() + "] : " + data.size()); } + comboBox.setData(data); } /** diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index 1c12d36..4d9f4ea 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -60,9 +60,10 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab public static final String PROPERTY_CAN_WRITE = "canWrite"; + public static final String PROPERTY_FORM_DTO = "formDto"; + /** Logger */ static private final Log log = LogFactory.getLog(ContentUIModel.class); - private static final long serialVersionUID = 1L; protected final Class<E> beanType; @@ -148,7 +149,9 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab } public void setFormDto(FormDto<E> formDto) { + Object oldValue = getFormDto(); this.formDto = formDto; + firePropertyChange(PROPERTY_FORM_DTO, oldValue, formDto); } public ContentMode getMode() { diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java index 95356d6..56ee9aa 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto; * #L% */ +import com.google.common.base.Optional; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; @@ -52,11 +53,11 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { public <D extends IdDto> ReferenceSetDto<D> getReferenceSetDto(Class<D> type) { - ReferenceSetDto referenceSetDto = Iterables.find(getLabels(), ReferenceSetDtos.newTypePredicate(type)); - if (referenceSetDto == null) { + Optional<ReferenceSetDto> referenceSetDto = Iterables.tryFind(getLabels(), ReferenceSetDtos.newTypePredicate(type)); + if (!referenceSetDto.isPresent()) { throw new ReferenceSetNotFoundException(this, type); } - return referenceSetDto; + return referenceSetDto.get(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 35287edf1e4391e355cfbbee40a67bb603dd0f1e Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 12:17:54 2015 +0200 correction de l'ouverture de l'écran de marée (refs #7586) --- .../business/db/model/DataSelectionModel.java | 345 +++++++++++---------- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../content/open/impl/longline/TripLonglineUI.css | 7 +- .../ui/content/open/impl/seine/TripSeineUI.css | 6 +- .../ui/storage/tabs/StorageTabUIHandler.java | 3 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../services/dto/referential/PersonDtos.java | 48 +++ .../services/dto/referential/ReferentialDtos.java | 40 +++ .../services/dto/ObserveDtosInitializer.java | 6 +- 9 files changed, 286 insertions(+), 185 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java index f51b7f8..41e4382 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java @@ -6,12 +6,14 @@ package fr.ird.observe.business.db.model; */ import fr.ird.observe.services.dto.ReferenceDto; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.Serializable; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -205,28 +207,28 @@ public class DataSelectionModel implements Serializable { return selectedReferentiel.isEmpty(); } -// public boolean isReferentielFull() { -// return selectedReferentiel.size() == nbReferentiels; -// } + public boolean isReferentielFull() { + return selectedReferentiel.size() == nbReferentiels; + } public boolean isDataEmpty() { return selectedData == null || selectedData.isEmpty(); } -// public boolean isDataFull() { -// return selectedData != null && selectedData.size() == nbTrips; -// } + public boolean isDataFull() { + return selectedData != null && selectedData.size() == nbTrips; + } public Set<Class<?>> getSelectedReferentiel() { return selectedReferentiel; } -// public Map<String, List<String>> getDatas() { -// if (datas == null) { -// datas = new HashMap<String, List<String>>(); -// } -// return datas; -// } + public Map<String, List<String>> getDatas() { + if (datas == null) { + datas = new HashMap<String, List<String>>(); + } + return datas; + } public Set<String> getSelectedData() { if (selectedData == null) { @@ -259,47 +261,47 @@ public class DataSelectionModel implements Serializable { // } // return result; // } -// -// public boolean isSelectedData(String id) { -// -// if (Trips.isTripId(id)) { -// -// // recherche directe sur les ids de marees -// return getSelectedData().contains(id); -// } -// -// if (id.startsWith(Program.class.getName())) { -// // on doit verifier que toutes les marees du program sont sélectionnées -// List<String> tripIds = datas.get(id); -// if (CollectionUtils.isEmpty(tripIds)) { -// -// // pas de marées -// return false; -// } -// -// for (String tripId : tripIds) { -// if (!isSelectedData(tripId)) { -// -// // au moins une marée non sélectionnée -// -// return false; -// } -// } -// -// // toutes les marées sont sélectionnée -// return true; -// } -// -// // ne devrait pas arrivée -// return false; -// -// } -// -// public boolean isSelectedReferentiel(Class<?> type) { -// checkReferentielType(type); -// return getSelectedReferentiel().contains(type); -// } -// + + public boolean isSelectedData(String id) { + + if (isTripId(id)) { + + // recherche directe sur les ids de marees + return getSelectedData().contains(id); + } + + if (isProgramId(id)) { + // on doit verifier que toutes les marees du program sont sélectionnées + List<String> tripIds = datas.get(id); + if (CollectionUtils.isEmpty(tripIds)) { + + // pas de marées + return false; + } + + for (String tripId : tripIds) { + if (!isSelectedData(tripId)) { + + // au moins une marée non sélectionnée + + return false; + } + } + + // toutes les marées sont sélectionnée + return true; + } + + // ne devrait pas arrivée + return false; + + } + + public boolean isSelectedReferentiel(Class<?> type) { + checkReferentielType(type); + return getSelectedReferentiel().contains(type); + } + // public void setUseReferentiel(boolean useReferentiel) { // this.useReferentiel = useReferentiel; // firePropertyChange(PROPERTY_USE_REFERENTIEL, useReferentiel); @@ -314,29 +316,29 @@ public class DataSelectionModel implements Serializable { // this.useOpenData = useOpenData; // firePropertyChange(PROPERTY_USE_OPEN_DATA, useOpenData); // } -// -// public void addSelectedReferentiel(Class<?> type) { -// checkReferentielType(type); -// if (log.isDebugEnabled()) { -// log.debug("Add referentiel type " + type); -// } -// getSelectedReferentiel().add(type); -// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); -// } -// -// public void addAllSelectedReferentiel() { -// getSelectedReferentiel().addAll(referentiel); -// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); -// } -// -// public void removeSelectedReferentiel(Class<?> type) { -// checkReferentielType(type); -// if (log.isDebugEnabled()) { -// log.debug("remove referentiel type " + type); -// } -// getSelectedReferentiel().remove(type); -// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); -// } + + public void addSelectedReferentiel(Class<?> type) { + checkReferentielType(type); + if (log.isDebugEnabled()) { + log.debug("Add referentiel type " + type); + } + getSelectedReferentiel().add(type); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + } + + public void addAllSelectedReferentiel() { + getSelectedReferentiel().addAll(referentiel); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + } + + public void removeSelectedReferentiel(Class<?> type) { + checkReferentielType(type); + if (log.isDebugEnabled()) { + log.debug("remove referentiel type " + type); + } + getSelectedReferentiel().remove(type); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + } public void removeAll() { getSelectedReferentiel().clear(); @@ -345,89 +347,90 @@ public class DataSelectionModel implements Serializable { firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); } -// public void removeAllSelectedReferentiel() { -// getSelectedReferentiel().clear(); -// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); -// } -// -// public void setDatas(Map<String, List<String>> datas) { -// this.datas = datas; -// -// // on compte le count de marées totale -// int nbTrips = 0; -// if (datas != null) { -// for (List<String> marees : datas.values()) { -// nbTrips += marees.size(); -// } -// } -// this.nbTrips = nbTrips; -// -// if (log.isDebugEnabled()) { -// log.debug("Nb program registred : " + (datas == null ? 0 : datas.size())); -// log.debug("Nb trip registred : " + this.nbTrips); -// } -// firePropertyChange(PROPERTY_DATAS, datas); -// } -// -// public void addSelectedData(String id) { -// -// if (Trips.isTripId(id)) { -// -// // ajout d'une marée -// if (log.isDebugEnabled()) { -// log.debug("Add Trip " + id); -// } -// getSelectedData().add(id); -// } else if (id.startsWith(Program.class.getName())) { -// -// // ajout de toutes les marées du program -// -// if (log.isDebugEnabled()) { -// log.debug("Add all trips of program " + id); -// } -// getSelectedData().addAll(datas.get(id)); -// } -// -// -// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); -// } -// -// public void addAllSelectedData() { -// if (log.isDebugEnabled()) { -// log.debug("All all data."); -// } -// for (List<String> p : datas.values()) { -// getSelectedData().addAll(p); -// } -// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); -// } -// -// public void removeSelectedData(String id) { -// if (Trips.isTripId(id)) { -// -// // ajout d'une marée -// if (log.isDebugEnabled()) { -// log.debug("Remove maree " + id); -// } -// getSelectedData().remove(id); -// } else if (id.startsWith(Program.class.getName())) { -// -// // ajout de toutes les marées du program -// -// if (log.isDebugEnabled()) { -// log.debug("Remove all marees of program " + id); -// } -// getSelectedData().removeAll(datas.get(id)); -// } -// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); -// } -// -// public void removeAllSelectedData() { -// if (selectedData != null) { -// selectedData.clear(); -// } -// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); -// } + public void removeAllSelectedReferentiel() { + getSelectedReferentiel().clear(); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + } + + public void setDatas(Map<String, List<String>> datas) { + this.datas = datas; + + // on compte le count de marées totale + int nbTrips = 0; + if (datas != null) { + for (List<String> marees : datas.values()) { + nbTrips += marees.size(); + } + } + this.nbTrips = nbTrips; + + if (log.isDebugEnabled()) { + log.debug("Nb program registred : " + (datas == null ? 0 : datas.size())); + log.debug("Nb trip registred : " + this.nbTrips); + } + firePropertyChange(PROPERTY_DATAS, datas); + } + + public void addSelectedData(String id) { + + if (isTripId(id)) { + + // ajout d'une marée + if (log.isDebugEnabled()) { + log.debug("Add Trip " + id); + } + getSelectedData().add(id); + + } else if (isProgramId(id)) { + + // ajout de toutes les marées du program + + if (log.isDebugEnabled()) { + log.debug("Add all trips of program " + id); + } + getSelectedData().addAll(datas.get(id)); + } + + + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + + public void addAllSelectedData() { + if (log.isDebugEnabled()) { + log.debug("All all data."); + } + for (List<String> p : datas.values()) { + getSelectedData().addAll(p); + } + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + + public void removeSelectedData(String id) { + if (isTripId(id)) { + + // ajout d'une marée + if (log.isDebugEnabled()) { + log.debug("Remove maree " + id); + } + getSelectedData().remove(id); + } else if (isProgramId(id)) { + + // ajout de toutes les marées du program + + if (log.isDebugEnabled()) { + log.debug("Remove all marees of program " + id); + } + getSelectedData().removeAll(datas.get(id)); + } + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + + public void removeAllSelectedData() { + if (selectedData != null) { + selectedData.clear(); + } + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } public void addPropertyChangeListener(PropertyChangeListener listener) { pcs.addPropertyChangeListener(listener); @@ -457,13 +460,23 @@ public class DataSelectionModel implements Serializable { pcs.firePropertyChange(propertyName, oldValue, newValue); } -// protected void checkReferentielType(Class<?> type) { -// if (!referentiel.contains(type)) { -// throw new IllegalArgumentException( -// "given <" + type + "> is not in referentiel universe : " + -// referentiel); -// } -// } + protected void checkReferentielType(Class<?> type) { + if (!referentiel.contains(type)) { + throw new IllegalArgumentException( + "given <" + type + "> is not in referentiel universe : " + + referentiel); + } + } + + protected boolean isTripId(String id) { + String[] entityFullClass = id.split("#")[0].split("\\."); + return entityFullClass[entityFullClass.length - 1].startsWith("Trip"); + } + + private boolean isProgramId(String id) { + String[] entityFullClass = id.split("#")[0].split("\\."); + return entityFullClass[entityFullClass.length - 1].equals("Program"); + } public void destroy() { removeAll(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 1b2c5fc..97ddd8a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -863,7 +863,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E if (referentialEntity) { //TC-20100208 : on ne veut pas voir les elements du referentiel non actif - ReferentialDtos.filterReferentialListByStatus((List) data); + ReferentialDtos.filterReferentialReferenceListByStatus((List) data); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css index ce0baaf..17ed886 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css @@ -48,8 +48,7 @@ NumberEditor { #observer { property:{TripLonglineDto.PROPERTY_OBSERVER}; selectedItem:{bean.getObserver()}; - //FIXME - //_listPredicate:{PersonDtos.newObserverPredicate()}; + _listPredicate:{PersonDtos.newObserverReferencePredicate(true)}; } #captainLabel { @@ -60,7 +59,7 @@ NumberEditor { #captain { property:{TripLonglineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - _listPredicate:{PersonDtos.newCaptainPredicate(true)}; + _listPredicate:{PersonDtos.newCaptainReferencePredicate(true)}; } #dataEntryOperatorLabel { @@ -71,7 +70,7 @@ NumberEditor { #dataEntryOperator { property:{TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - _listPredicate:{PersonDtos.newDataEntryOperatorPredicate(true)}; + _listPredicate:{PersonDtos.newDataEntryOperatorReferencePredicate(true)}; } #tripTypeLabel{ diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index c125cc0..7eba914 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -52,7 +52,7 @@ NumberEditor { #observer { property:{TripSeineDto.PROPERTY_OBSERVER}; selectedItem:{bean.getObserver()}; - _listPredicate:{PersonDtos.newObserverPredicate(true)}; + _listPredicate:{PersonDtos.newObserverReferencePredicate(true)}; } #captainLabel { @@ -63,7 +63,7 @@ NumberEditor { #captain { property:{TripSeineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - _listPredicate:{PersonDtos.newCaptainPredicate(true)}; + _listPredicate:{PersonDtos.newCaptainReferencePredicate(true)}; } #dataEntryOperatorLabel { @@ -74,7 +74,7 @@ NumberEditor { #dataEntryOperator { property:{TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - _listPredicate:{PersonDtos.newDataEntryOperatorPredicate(true)}; + _listPredicate:{PersonDtos.newDataEntryOperatorReferencePredicate(true)}; } #vesselLabel { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index 5efc71e..3332fbe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -390,7 +390,8 @@ public class StorageTabUIHandler { DataSelectionTreeSelectionModel selectionModel = ui.getSelectionModel(); selectionModel.initUI(tree); - selectionModel.setDataModel(dataModel); +// FIXME +// selectionModel.setDataModel(dataModel); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java index 8ba4944..182a665 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java @@ -21,14 +21,14 @@ */ package fr.ird.observe.ui.tree; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTree; +import javax.swing.*; import javax.swing.event.EventListenerList; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; @@ -342,9 +342,7 @@ public class DataSelectionTreeSelectionModel implements TreeSelectionModel, Prop log.trace("begin data node " + node); } - //FIXME -// boolean result = dataModel.isSelectedData(node.getId()); - boolean result = false; + boolean result = dataModel.isSelectedData(node.getId()); if (log.isTraceEnabled()) { log.trace("selectModel contains the program ? " + result); } @@ -590,8 +588,7 @@ public class DataSelectionTreeSelectionModel implements TreeSelectionModel, Prop if (log.isTraceEnabled()) { log.trace("selectModel add " + id); } - //FIXME -// dataModel.addSelectedData(id); + dataModel.addSelectedData(id); } @@ -599,8 +596,7 @@ public class DataSelectionTreeSelectionModel implements TreeSelectionModel, Prop if (log.isTraceEnabled()) { log.trace("selectModel remove " + id); } - //FIXME -// dataModel.removeSelectedData(id); + dataModel.removeSelectedData(id); } @Override diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java new file mode 100644 index 0000000..6636735 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java @@ -0,0 +1,48 @@ +package fr.ird.observe.services.dto.referential; + +import com.google.common.base.Predicate; + +import java.util.Objects; + +public class PersonDtos extends AbstractPersonDtos { + + public static <BeanType extends PersonDto> Predicate<ReferentialReferenceDto<BeanType>> newCaptainReferencePredicate(boolean captain) { + final boolean $tmp = captain; + return new Predicate<ReferentialReferenceDto<BeanType>>() { + + @Override + public boolean apply(ReferentialReferenceDto<BeanType> input) { + return input.getPropertyNames().contains(PersonDto.PROPERTY_CAPTAIN) + && Objects.equals($tmp, input.getPropertyValue(PersonDto.PROPERTY_CAPTAIN)); + } + }; + + } + + public static <BeanType extends PersonDto> Predicate<ReferentialReferenceDto<BeanType>> newDataEntryOperatorReferencePredicate(boolean dataEntryOperator) { + final boolean $tmp = dataEntryOperator; + return new Predicate<ReferentialReferenceDto<BeanType>>() { + + @Override + public boolean apply(ReferentialReferenceDto<BeanType> input) { + return input.getPropertyNames().contains(PersonDto.PROPERTY_DATA_ENTRY_OPERATOR) + && Objects.equals($tmp, input.getPropertyValue(PersonDto.PROPERTY_DATA_ENTRY_OPERATOR)); + } + }; + + } + + public static <BeanType extends PersonDto> Predicate<ReferentialReferenceDto<BeanType>> newObserverReferencePredicate(boolean observer) { + final boolean $tmp = observer; + return new Predicate<ReferentialReferenceDto<BeanType>>() { + + @Override + public boolean apply(ReferentialReferenceDto<BeanType> input) { + return input.getPropertyNames().contains(PersonDto.PROPERTY_OBSERVER) + && Objects.equals($tmp, input.getPropertyValue(PersonDto.PROPERTY_OBSERVER)); + } + }; + + } + +} //PersonDtos diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java index 44747cf..cc9b4b1 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java @@ -2,6 +2,7 @@ package fr.ird.observe.services.dto.referential; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; @@ -137,7 +138,10 @@ public class ReferentialDtos extends AbstractReferentialDtos { */ public static <E extends ReferentialDto> void filterReferentialListByStatus(List<E> list) { filterReferentielList(list, (Predicate<E>) IS_ACTIF_PREDICATE); + } + public static <E extends ReferentialDto> void filterReferentialReferenceListByStatus(List<ReferentialReferenceDto<E>> list) { + filterReferentialReferenceList(list, IS_REFERENCE_ACTIF_PREDICATE); } /** @@ -167,6 +171,33 @@ public class ReferentialDtos extends AbstractReferentialDtos { } } + /** + * Filter une liste d'entités d'un référentiel en supprimant toutes les + * entités qui ne rspeciesnt pas le précidat donné. + * + * @param list la liste des entitées à filtrer + * @param predicate le prédicate à appliquer pour conserver les valeurs + * @param <E> le type des entites du référentiel + */ + public static <E extends ReferentialDto> void filterReferentialReferenceList( + List<ReferentialReferenceDto<E>> list, + Predicate<ReferentialReferenceDto> predicate) { + Iterator<ReferentialReferenceDto<E>> itr = list.iterator(); + while (itr.hasNext()) { + ReferentialReferenceDto<E> e = itr.next(); + if (!predicate.apply(e)) { + + // l'entite n'est pas retenue, on ne l'affiche pas + + if (log.isDebugEnabled()) { + log.debug("remove disabled entity " + e.getId()); + } + + itr.remove(); + } + } + } + public static final Predicate<ReferentialDto> IS_ACTIF_PREDICATE = new Predicate<ReferentialDto>() { @Override @@ -175,4 +206,13 @@ public class ReferentialDtos extends AbstractReferentialDtos { } }; + public static final Predicate<ReferentialReferenceDto> IS_REFERENCE_ACTIF_PREDICATE = + new Predicate<ReferentialReferenceDto>() { + + @Override + public boolean apply(ReferentialReferenceDto input) { + return ReferenceStatus.disabled != input.getStatus(); + } + }; + } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index f6927b1..b48db33 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -828,7 +828,11 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { PersonDto.PROPERTY_DATA_ENTRY_OPERATOR, PersonDto.PROPERTY_COUNTRY); registerReferentialReferenceDtoBinder(PersonDto.class, Person.class, false, - PersonDto.PROPERTY_FIRST_NAME, PersonDto.PROPERTY_LAST_NAME); + PersonDto.PROPERTY_FIRST_NAME, + PersonDto.PROPERTY_LAST_NAME, + PersonDto.PROPERTY_CAPTAIN, + PersonDto.PROPERTY_DATA_ENTRY_OPERATOR, + PersonDto.PROPERTY_OBSERVER); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d4e5353cb86a56c20df54000b557914f2f3fdf52 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 12:48:17 2015 +0200 affichage de l'écran d'édition de marée quand on clique sur nouvelle marée (refs #7586) --- .../java/fr/ird/observe/ui/content/ContentUIManager.java | 16 ++++++++-------- .../i18n/observe-application-swing_en_GB.properties | 8 ++++++++ .../i18n/observe-application-swing_es_ES.properties | 8 ++++++++ .../i18n/observe-application-swing_fr_FR.properties | 16 ++++++++-------- .../main/resources/i18n/observe-swing_fr_FR.properties | 16 ++++++++-------- 5 files changed, 40 insertions(+), 24 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 3e2a2e1..39ad3ae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -112,23 +112,23 @@ public class ContentUIManager { addMapping(DATA, ProgramDto.class, GearType.seine.name(), TripSeinesUI.class); addMapping(DATA, TripSeineDto.class, TripSeineUI.class); - addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeine.unsaved"), TripSeineUI.class); + addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeineDto.unsaved"), TripSeineUI.class); //FIXME // addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); // addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class); addMapping(DATA, RouteDto.class, RouteUI.class); - addMapping(DATA, RouteDto.class, n("observe.tree.route.unsaved"), RouteUI.class); + addMapping(DATA, RouteDto.class, n("observe.tree.routeDto.unsaved"), RouteUI.class); //FIXME // addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); addMapping(DATA, ActivitySeineDto.class, ActivitySeineUI.class); - addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeine.unsaved"), ActivitySeineUI.class); + addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeineDto.unsaved"), ActivitySeineUI.class); //FIXME addMapping(DATA, ActivitySeineDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); addMapping(DATA, SetSeineDto.class, SetSeineUI.class); - addMapping(DATA, SetSeineDto.class, n("observe.tree.setSeine.unsaved"), SetSeineUI.class); + addMapping(DATA, SetSeineDto.class, n("observe.tree.setSeineDto.unsaved"), SetSeineUI.class); addMapping(DATA, SetSeineDto.class, SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE, SchoolEstimateUI.class); addMapping(DATA, SetSeineDto.class, SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH, TargetCatchUI.class); addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_DISCARDED, TargetDiscardCatchUI.class); @@ -139,7 +139,7 @@ public class ContentUIManager { // addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_NON_TARGET_SAMPLE, NonTargetSampleUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectUI.class); - addMapping(DATA, FloatingObjectDto.class, n("observe.tree.floatingObject.unsaved"), FloatingObjectUI.class); + addMapping(DATA, FloatingObjectDto.class, n("observe.tree.floatingObjectDto.unsaved"), FloatingObjectUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectDto.PROPERTY_OBJECT_OPERATION, FloatingObjectTransmittingBuoyOperationUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES, ObjectObservedSpeciesUI.class); addMapping(DATA, FloatingObjectDto.class, FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE, ObjectSchoolEstimateUI.class); @@ -149,18 +149,18 @@ public class ContentUIManager { addMapping(DATA, ProgramDto.class, GearType.longline.name(), TripLonglinesUI.class); addMapping(DATA, TripLonglineDto.class, TripLonglineUI.class); - addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLongline.unsaved"), TripLonglineUI.class); + addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLonglineDto.unsaved"), TripLonglineUI.class); //FIXME // addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_GEAR_USE_FEATURES_LONGLINE, GearUseFeaturesLonglineUI.class); // addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineUI.class); - addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); + addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLonglineDto.unsaved"), ActivityLonglineUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER, EncounterUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED, SensorUsedUI.class); addMapping(DATA, SetLonglineDto.class, SetLonglineUI.class); - addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLongline.unsaved"), SetLonglineUI.class); + addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLonglineDto.unsaved"), SetLonglineUI.class); addMapping(DATA, SetLonglineDto.class, "longlineGlobalComposition", LonglineGlobalCompositionUI.class); addMapping(DATA, SetLonglineDto.class, "longlineDetailComposition", LonglineDetailCompositionUI.class); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 04b9ede..659cd71 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -2244,8 +2244,10 @@ observe.title.validate.tip=Validate datas of a storage observe.title.welcome.admin=Observe Admin observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity +observe.tree.activityLonglineDto.unsaved= observe.tree.activitySeine=Activity observe.tree.activitySeine.unsaved=New activity +observe.tree.activitySeineDto.unsaved= observe.tree.baitHaulingStatus=Bait hauling status observe.tree.baitSettingStatus=Bait setting status observe.tree.baitType=Bait type @@ -2256,6 +2258,7 @@ observe.tree.detectionMode=Detection mode observe.tree.encounter=Encounter observe.tree.encounterType= observe.tree.floatingObject.unsaved=New DCP +observe.tree.floatingObjectDto.unsaved= observe.tree.fpaZone=Fpa zone observe.tree.gear=Gear observe.tree.gearCaracteristic=Gear caracteristic @@ -2297,6 +2300,7 @@ observe.tree.reference.longline=Longline Referential observe.tree.reference.seine=Seine Referential observe.tree.route=Road observe.tree.route.unsaved=New route +observe.tree.routeDto.unsaved= observe.tree.schoolEstimate=School estimate observe.tree.sensorBrand=Sensor brand observe.tree.sensorDataFormat=Sensor data format @@ -2304,8 +2308,10 @@ observe.tree.sensorType=Sensor type observe.tree.sensorUsed=Sensor used observe.tree.setLongline= observe.tree.setLongline.unsaved=New fishing operation +observe.tree.setLonglineDto.unsaved= observe.tree.setSeine= observe.tree.setSeine.unsaved=New set +observe.tree.setSeineDto.unsaved= observe.tree.settingShape=Setting shape observe.tree.sex=Sex observe.tree.sizeMeasureType=Size measure type @@ -2324,7 +2330,9 @@ observe.tree.tdr=TDR observe.tree.transmittingBuoyOperation=Transmitting buoy operation observe.tree.transmittingBuoyType=Transmitting buoy type observe.tree.tripLongline.unsaved=New trip +observe.tree.tripLonglineDto.unsaved= observe.tree.tripSeine.unsaved=New trip +observe.tree.tripSeineDto.unsaved= observe.tree.tripType=Trip type observe.tree.vessel=Boat observe.tree.vesselActivityLongline=Boat activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index a7a9db4..e2f9403 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -2246,8 +2246,10 @@ observe.title.validate.tip= observe.title.welcome.admin= observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved= +observe.tree.activityLonglineDto.unsaved= observe.tree.activitySeine=Actividad observe.tree.activitySeine.unsaved= +observe.tree.activitySeineDto.unsaved= observe.tree.baitHaulingStatus= observe.tree.baitSettingStatus= observe.tree.baitType= @@ -2258,6 +2260,7 @@ observe.tree.detectionMode=Modo de detección observe.tree.encounter= observe.tree.encounterType= observe.tree.floatingObject.unsaved=Nuevo DCP +observe.tree.floatingObjectDto.unsaved= observe.tree.fpaZone= observe.tree.gear= observe.tree.gearCaracteristic= @@ -2299,6 +2302,7 @@ observe.tree.reference.longline= observe.tree.reference.seine= observe.tree.route=Ruta observe.tree.route.unsaved=Nueva ruta +observe.tree.routeDto.unsaved= observe.tree.schoolEstimate=Estimación del banco observe.tree.sensorBrand= observe.tree.sensorDataFormat= @@ -2306,8 +2310,10 @@ observe.tree.sensorType= observe.tree.sensorUsed= observe.tree.setLongline= observe.tree.setLongline.unsaved=Nuevo Lance +observe.tree.setLonglineDto.unsaved= observe.tree.setSeine= observe.tree.setSeine.unsaved=Nuevo Lance +observe.tree.setSeineDto.unsaved= observe.tree.settingShape= observe.tree.sex=Sexo observe.tree.sizeMeasureType= @@ -2326,7 +2332,9 @@ observe.tree.tdr= observe.tree.transmittingBuoyOperation= observe.tree.transmittingBuoyType= observe.tree.tripLongline.unsaved=Nueva marea +observe.tree.tripLonglineDto.unsaved= observe.tree.tripSeine.unsaved=Nueva marea +observe.tree.tripSeineDto.unsaved= observe.tree.tripType= observe.tree.vessel=Barco observe.tree.vesselActivityLongline= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 37890d7..40aa3da 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -2243,9 +2243,9 @@ observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur observe.tree.activityLongline=Activités -observe.tree.activityLongline.unsaved=Nouvelle activité +observe.tree.activityLonglineDto.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -observe.tree.activitySeine.unsaved=Nouvelle activité +observe.tree.activitySeineDto.unsaved=Nouvelle activité observe.tree.baitHaulingStatus=Status de l'appât au virage observe.tree.baitSettingStatus=Status de l'appât au filage observe.tree.baitType=Type d'appât @@ -2255,7 +2255,7 @@ observe.tree.country=Pays observe.tree.detectionMode=Mode détection observe.tree.encounter=Rencontres observe.tree.encounterType=Type de rencontre -observe.tree.floatingObject.unsaved=Nouveau DCP +observe.tree.floatingObjectDto.unsaved=Nouveau DCP observe.tree.fpaZone=Zone FPA observe.tree.gear=Équipement observe.tree.gearCaracteristic=Caractéristique d'un équipement @@ -2296,16 +2296,16 @@ observe.tree.reference.common=Référentiel commun observe.tree.reference.longline=Référentiel Palangre observe.tree.reference.seine=Référentiel Senne observe.tree.route=Routes -observe.tree.route.unsaved=Nouvelle route +observe.tree.routeDto.unsaved=Nouvelle route observe.tree.schoolEstimate=Estimation banc observe.tree.sensorBrand=Marque de capteur observe.tree.sensorDataFormat=Format de données de capteur observe.tree.sensorType=Type de capteur observe.tree.sensorUsed=Capteurs utilisés observe.tree.setLongline=Détails de l'opération -observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setLonglineDto.unsaved=Nouvelle opération de pêche observe.tree.setSeine=Calée -observe.tree.setSeine.unsaved=Nouvelle calée +observe.tree.setSeineDto.unsaved=Nouvelle calée observe.tree.settingShape=Forme au filage observe.tree.sex=Sexe observe.tree.sizeMeasureType=Type de mesure de taille @@ -2323,8 +2323,8 @@ observe.tree.targetSampleCapture=Echantillon thon capturé observe.tree.tdr=Enregistreurs de profondeur observe.tree.transmittingBuoyOperation=Opération balise observe.tree.transmittingBuoyType=Type de balise -observe.tree.tripLongline.unsaved=Nouvelle marée -observe.tree.tripSeine.unsaved=Nouvelle marée +observe.tree.tripLonglineDto.unsaved=Nouvelle marée +observe.tree.tripSeineDto.unsaved=Nouvelle marée observe.tree.tripType=Type de marée observe.tree.vessel=Bateau observe.tree.vesselActivityLongline=Activité bateau diff --git a/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 6c7d853..64534f3 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -2024,9 +2024,9 @@ observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur observe.tree.activityLongline=Activités -observe.tree.activityLongline.unsaved=Nouvelle activité +observe.tree.activityLonglineDto.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -observe.tree.activitySeine.unsaved=Nouvelle activité +observe.tree.activitySeineDto.unsaved=Nouvelle activité observe.tree.baitHaulingStatus=Status de l'appât au virage observe.tree.baitSettingStatus=Status de l'appât au filage observe.tree.baitType=Type d'appât @@ -2036,7 +2036,7 @@ observe.tree.country=Pays observe.tree.detectionMode=Mode détection observe.tree.encounter=Rencontres observe.tree.encounterType=Type de rencontre -observe.tree.floatingObject.unsaved=Nouveau DCP +observe.tree.floatingObjectDto.unsaved=Nouveau DCP observe.tree.fpaZone=Zone FPA observe.tree.gear=Équipement observe.tree.gearCaracteristic=Caractéristique d'un équipement @@ -2077,16 +2077,16 @@ observe.tree.reference.common=Référentiel commun observe.tree.reference.longline=Référentiel Palangre observe.tree.reference.seine=Référentiel Senne observe.tree.route=Routes -observe.tree.route.unsaved=Nouvelle route +observe.tree.routeDto.unsaved=Nouvelle route observe.tree.schoolEstimate=Estimation banc observe.tree.sensorBrand=Marque de capteur observe.tree.sensorDataFormat=Format de données de capteur observe.tree.sensorType=Type de capteur observe.tree.sensorUsed=Capteurs utilisés observe.tree.setLongline=Détails de l'opération -observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setLonglineDto.unsaved=Nouvelle opération de pêche observe.tree.setSeine=Calée -observe.tree.setSeine.unsaved=Nouvelle calée +observe.tree.setSeineDto.unsaved=Nouvelle calée observe.tree.settingShape=Forme au filage observe.tree.sex=Sexe observe.tree.sizeMeasureType=Type de mesure de taille @@ -2104,8 +2104,8 @@ observe.tree.targetSampleCapture=Echantillon thon capturé observe.tree.tdr=Enregistreurs de profondeur observe.tree.transmittingBuoyOperation=Opération balise observe.tree.transmittingBuoyType=Type de balise -observe.tree.tripLongline.unsaved=Nouvelle marée -observe.tree.tripSeine.unsaved=Nouvelle marée +observe.tree.tripLonglineDto.unsaved=Nouvelle marée +observe.tree.tripSeineDto.unsaved=Nouvelle marée observe.tree.tripType=Type de marée observe.tree.vessel=Bateau observe.tree.vesselActivityLongline=Activité bateau -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit fe0a5771f418e9a28b35eb892b35da0054c6481a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 15:44:22 2015 +0200 chargement des triplonglines (refs #7586) --- .../observe/ObserveSwingApplicationContext.java | 10 ++++---- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +++----- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 +++++++++------- .../v1/longline/TripLonglineServiceController.java | 5 ++-- .../service/longline/TripLonglineService.java | 3 +-- .../service/longline/TripLonglineServiceTopia.java | 29 +++++++++++----------- 7 files changed, 40 insertions(+), 41 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 98888d7..cc513f3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -40,7 +40,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -753,11 +753,11 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { } } else if (ProgramDtos.isProgramLongline(programDtoRef)) { - ReferenceSetDto<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); + ReferenceSetDto<TripLonglineDto> tripLonglines = tripLonglineService.getTripLonglineByProgram(programDtoRef.getId()); for (ReferenceDto tripLongline : tripLonglines.getReference()) { - log.info(" - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_VESSEL_LABEL) - + " " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE) - + " - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE)); + log.info(" - " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_VESSEL) + + " " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_START_DATE) + + " - " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_END_DATE)); } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index c8d343c..937e623 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -26,11 +26,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.service.ReferentialService; @@ -102,19 +100,19 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri protected List<ReferenceDto> getChilds(ProgramDto bean) { TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); - ReferenceSetDto<TripLonglineStubDto> tripLonglineStubByProgram = service.getTripLonglineStubByProgram(bean.getId()); + ReferenceSetDto<TripLonglineDto> tripLonglineByProgram = service.getTripLonglineByProgram(bean.getId()); if (log.isDebugEnabled()) { - log.debug("Will use " + tripLonglineStubByProgram.sizeReference() + " trips."); + log.debug("Will use " + tripLonglineByProgram.sizeReference() + " trips."); } - return new ArrayList<>(tripLonglineStubByProgram.getReference()); + return new ArrayList<>(tripLonglineByProgram.getReference()); } @Override protected void loadParentBean() { ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - FormDto<ProgramDto> programDtoFormDto = service.loadToEdit(ProgramDto.class, getSelectedParentId()); + FormDto<ProgramDto> programDtoFormDto = service.loadToRead(ProgramDto.class, getSelectedParentId()); getModel().setFormDto(programDtoFormDto); ProgramDtos.copyProgramDto(programDtoFormDto.getForm(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java index 2d9ee1d..354003c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java @@ -81,7 +81,7 @@ public class DataSelectionModel implements Serializable { } else if (ProgramDtos.isProgramLongline(program)) { - referenceDtos.addAll(tripLonglineService.getTripLonglineStubByProgram(program.getId()).getReference()); + referenceDtos.addAll(tripLonglineService.getTripLonglineByProgram(program.getId()).getReference()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 19856f8..4dfb61f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -22,14 +22,20 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripLonglineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -100,11 +106,10 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa // result = service.getTripLonglineStubByProgram(dataSource, parentId); // // } + TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + ReferenceSetDto<TripLonglineDto> tripLonglineByProgram = tripLonglineService.getTripLonglineByProgram(parentId); - //FIXME -// return result; - return null; - + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(tripLonglineByProgram.getReference())); } @Override @@ -121,16 +126,15 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa { // Add gears //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(TripLongline.PROPERTY_GEAR_USE_FEATURES_LONGLINE); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("gearUseFeaturesLongline"); + result.add(child); } { // Add activities //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode( -// TripLongline.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesNodeChildLoador.class); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("activityLongline", ActivityLonglinesNodeChildLoador.class); + result.add(child); } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java index a6f84a7..2f49cc5 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.service.longline.TripLonglineService; /** @@ -40,8 +39,8 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { - return service.getTripLonglineStubByProgram(programId); + public ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId) { + return service.getTripLonglineByProgram(programId); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java index 542ab5c..92482c6 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -40,7 +39,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TripLonglineService extends ObserveService { @ReadDataPermission - ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId); + ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId); @ReadDataPermission TripMapDto getTripLonglineMap(String tripLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 486424d..a618510 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; import org.nuiton.util.DateUtil; @@ -57,36 +56,36 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { + public ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); List<TripLongline> tripLonglines = getDao().findAllStubByProgramId(programId, referenceLocale); - LinkedHashSet<ReferenceDto<TripLonglineStubDto>> stubs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<TripLonglineDto>> stubs = Sets.newLinkedHashSet(); for (TripLongline tripLongline : tripLonglines) { - ReferenceDto<TripLonglineStubDto> stub = - ReferenceDtos.newReferenceDto(TripLonglineStubDto.class, - Lists.newArrayList(TripLonglineStubDto.PROPERTY_START_DATE, - TripLonglineStubDto.PROPERTY_END_DATE, - TripLonglineStubDto.PROPERTY_VESSEL_LABEL, - TripLonglineStubDto.PROPERTY_OBSERVER_LABEL)); + ReferenceDto<TripLonglineDto> stub = + ReferenceDtos.newReferenceDto(TripLonglineDto.class, + Lists.newArrayList(TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OBSERVER)); stub.setId(tripLongline.getTopiaId()); - stub.setPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE, tripLongline.getStartDate()); - stub.setPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE, tripLongline.getEndDate()); - stub.setPropertyValue(TripLonglineStubDto.PROPERTY_VESSEL_LABEL, referenceLocale.getLabel(tripLongline.getVessel())); - stub.setPropertyValue(TripLonglineStubDto.PROPERTY_OBSERVER_LABEL, tripLongline.getObserverLabel()); + stub.setPropertyValue(TripLonglineDto.PROPERTY_START_DATE, tripLongline.getStartDate()); + stub.setPropertyValue(TripLonglineDto.PROPERTY_END_DATE, tripLongline.getEndDate()); + stub.setPropertyValue(TripLonglineDto.PROPERTY_VESSEL, referenceLocale.getLabel(tripLongline.getVessel())); + stub.setPropertyValue(TripLonglineDto.PROPERTY_OBSERVER, tripLongline.getObserverLabel()); stubs.add(stub); } Optional<Date> lastUpdateOptional = getLastUpdate(TripLongline.class); - ReferenceSetDto<TripLonglineStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(TripLonglineStubDto.class, stubs, lastUpdateOptional.orNull()); + ReferenceSetDto<TripLonglineDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(TripLonglineDto.class, stubs, lastUpdateOptional.orNull()); return stubReferences; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 54f7e07ed265ede21edc01962a5e20616276cdc4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 16:00:38 2015 +0200 fix decorator(refs #7586) --- .../java/fr/ird/observe/ui/DecoratorService.java | 122 ++++++++++----------- 1 file changed, 60 insertions(+), 62 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index 6cc81f0..8bb4dd0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -403,7 +403,7 @@ public class DecoratorService extends DecoratorProvider { String libelle = referentialLocale.getLibelle(); registerJXPathDecorator(ProgramDto.class, t("observe.common.program") + - " ${" + libelle + "}$s"); + " ${" + libelle + "}$s"); registerReferenceDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); @@ -412,28 +412,28 @@ public class DecoratorService extends DecoratorProvider { ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s", "##", " - "); - registerReferenceDtoDecorator(ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s"); + registerReferenceDtoDecorator(ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine}$s"); registerMultiJXPathDecorator( ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", "##", " - "); registerReferenceDtoDecorator(ActivityLonglineDto.class, - "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s"); + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline}$s"); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); registerReferenceDtoDecorator(PersonDto.class, "${lastName}$s##${firstName}$s"); - registerDefaultReferenceDtoDecorator(SexDto.class, libelle); + registerDefaultReferenceDtoDecorator(SexDto.class); //FIXME Use startDate - endDate - registerDefaultReferenceDtoDecorator(FpaZoneDto.class, libelle); - registerDefaultReferenceDtoDecorator(OceanDto.class, libelle); - registerDefaultReferenceDtoDecorator(DetectionModeDto.class, libelle); - registerDefaultReferenceDtoDecorator(VesselDto.class, libelle); - registerDefaultReferenceDtoDecorator(CountryDto.class, libelle); + registerDefaultReferenceDtoDecorator(FpaZoneDto.class); + registerDefaultReferenceDtoDecorator(OceanDto.class); + registerDefaultReferenceDtoDecorator(DetectionModeDto.class); + registerDefaultReferenceDtoDecorator(VesselDto.class); + registerDefaultReferenceDtoDecorator(CountryDto.class); registerReferenceDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); - registerDefaultReferenceDtoDecorator(VesselTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(VesselActivitySeineDto.class, libelle); - registerDefaultReferenceDtoDecorator(SurroundingActivityDto.class, libelle); - registerDefaultReferenceDtoDecorator(ObservedSystemDto.class, libelle); - registerReferenceDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); + registerDefaultReferenceDtoDecorator(VesselTypeDto.class); + registerDefaultReferenceDtoDecorator(VesselActivitySeineDto.class); + registerDefaultReferenceDtoDecorator(SurroundingActivityDto.class); + registerDefaultReferenceDtoDecorator(ObservedSystemDto.class); + registerReferenceDtoDecorator(WindDto.class, "${code}$s##${label}$s##${speedRange}$s"); registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); @@ -442,49 +442,49 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this registerJXPathDecorator(SetLonglineDto.class, t("observe.common.setLongline")); - registerDefaultReferenceDtoDecorator(ObjectFateDto.class, libelle); - registerDefaultReferenceDtoDecorator(OrganismDto.class, libelle); - registerDefaultReferenceDtoDecorator(ObjectTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(ObjectOperationDto.class, libelle); - registerDefaultReferenceDtoDecorator(SpeciesStatusDto.class, libelle); - registerDefaultReferenceDtoDecorator(TransmittingBuoyTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(TransmittingBuoyOperationDto.class, libelle); - registerDefaultReferenceDtoDecorator(ReasonForNullSetDto.class, libelle); - registerDefaultReferenceDtoDecorator(ReasonForNoFishingDto.class, libelle); - registerDefaultReferenceDtoDecorator(WeightCategoryDto.class, libelle); - registerDefaultReferenceDtoDecorator(ReasonForDiscardDto.class, libelle); - registerDefaultReferenceDtoDecorator(SpeciesFateDto.class, libelle); - registerDefaultReferenceDtoDecorator(SpeciesGroupDto.class, libelle); - registerDefaultReferenceDtoDecorator(SpeciesListDto.class, libelle); - - registerDefaultReferenceDtoDecorator(BaitHaulingStatusDto.class, libelle); - registerDefaultReferenceDtoDecorator(BaitSettingStatusDto.class, libelle); - registerDefaultReferenceDtoDecorator(BaitTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(CatchFateLonglineDto.class, libelle); - registerDefaultReferenceDtoDecorator(EncounterTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(HealthnessDto.class, libelle); - registerDefaultReferenceDtoDecorator(HookPositionDto.class, libelle); - registerDefaultReferenceDtoDecorator(HookSizeDto.class, libelle); - registerDefaultReferenceDtoDecorator(HookTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(ItemVerticalPositionDto.class, libelle); - registerDefaultReferenceDtoDecorator(ItemHorizontalPositionDto.class, libelle); - registerDefaultReferenceDtoDecorator(LightsticksColorDto.class, libelle); - registerDefaultReferenceDtoDecorator(LightsticksTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(LineTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(MaturityStatusDto.class, libelle); - registerDefaultReferenceDtoDecorator(MitigationTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObjectFateDto.class); + registerDefaultReferenceDtoDecorator(OrganismDto.class); + registerDefaultReferenceDtoDecorator(ObjectTypeDto.class); + registerDefaultReferenceDtoDecorator(ObjectOperationDto.class); + registerDefaultReferenceDtoDecorator(SpeciesStatusDto.class); + registerDefaultReferenceDtoDecorator(TransmittingBuoyTypeDto.class); + registerDefaultReferenceDtoDecorator(TransmittingBuoyOperationDto.class); + registerDefaultReferenceDtoDecorator(ReasonForNullSetDto.class); + registerDefaultReferenceDtoDecorator(ReasonForNoFishingDto.class); + registerDefaultReferenceDtoDecorator(WeightCategoryDto.class); + registerDefaultReferenceDtoDecorator(ReasonForDiscardDto.class); + registerDefaultReferenceDtoDecorator(SpeciesFateDto.class); + registerDefaultReferenceDtoDecorator(SpeciesGroupDto.class); + registerDefaultReferenceDtoDecorator(SpeciesListDto.class); + + registerDefaultReferenceDtoDecorator(BaitHaulingStatusDto.class); + registerDefaultReferenceDtoDecorator(BaitSettingStatusDto.class); + registerDefaultReferenceDtoDecorator(BaitTypeDto.class); + registerDefaultReferenceDtoDecorator(CatchFateLonglineDto.class); + registerDefaultReferenceDtoDecorator(EncounterTypeDto.class); + registerDefaultReferenceDtoDecorator(HealthnessDto.class); + registerDefaultReferenceDtoDecorator(HookPositionDto.class); + registerDefaultReferenceDtoDecorator(HookSizeDto.class); + registerDefaultReferenceDtoDecorator(HookTypeDto.class); + registerDefaultReferenceDtoDecorator(ItemVerticalPositionDto.class); + registerDefaultReferenceDtoDecorator(ItemHorizontalPositionDto.class); + registerDefaultReferenceDtoDecorator(LightsticksColorDto.class); + registerDefaultReferenceDtoDecorator(LightsticksTypeDto.class); + registerDefaultReferenceDtoDecorator(LineTypeDto.class); + registerDefaultReferenceDtoDecorator(MaturityStatusDto.class); + registerDefaultReferenceDtoDecorator(MitigationTypeDto.class); registerReferenceDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); - registerDefaultReferenceDtoDecorator(SensorDataFormatDto.class, libelle); - registerDefaultReferenceDtoDecorator(SensorTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(SettingShapeDto.class, libelle); - registerDefaultReferenceDtoDecorator(SizeMeasureTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(StomacFullnessDto.class, libelle); - registerDefaultReferenceDtoDecorator(TripTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(VesselActivityLonglineDto.class, libelle); - registerDefaultReferenceDtoDecorator(WeightMeasureTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(GearCaracteristicTypeDto.class, libelle); - registerDefaultReferenceDtoDecorator(GearCaracteristicDto.class, libelle); - registerDefaultReferenceDtoDecorator(GearDto.class, libelle); + registerDefaultReferenceDtoDecorator(SensorDataFormatDto.class); + registerDefaultReferenceDtoDecorator(SensorTypeDto.class); + registerDefaultReferenceDtoDecorator(SettingShapeDto.class); + registerDefaultReferenceDtoDecorator(SizeMeasureTypeDto.class); + registerDefaultReferenceDtoDecorator(StomacFullnessDto.class); + registerDefaultReferenceDtoDecorator(TripTypeDto.class); + registerDefaultReferenceDtoDecorator(VesselActivityLonglineDto.class); + registerDefaultReferenceDtoDecorator(WeightMeasureTypeDto.class); + registerDefaultReferenceDtoDecorator(GearCaracteristicTypeDto.class); + registerDefaultReferenceDtoDecorator(GearCaracteristicDto.class); + registerDefaultReferenceDtoDecorator(GearDto.class); registerReferenceDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); @@ -529,15 +529,13 @@ public class DecoratorService extends DecoratorProvider { // TripSeine decorator registerDecorator(new TripSeineDecorator(libelle)); registerReferenceDtoDecorator(TripSeineDto.class, - "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" - + libelle + "}$s##${observerLabel}$s"); + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel}$s##${observer}$s"); // TripLongline decorator registerDecorator(new TripLonglineDecorator(libelle)); registerReferenceDtoDecorator(TripLonglineDto.class, - "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" - + libelle + "}$s##${observerLabel}$s"); + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel}$s##${observer}$s"); String oldCode = l(locale, "observe.common.oldCode3L"); // Species decorator @@ -577,8 +575,8 @@ public class DecoratorService extends DecoratorProvider { } - protected <T extends IdDto> void registerDefaultReferenceDtoDecorator(Class<T> referenceType, String libelle) { - registerReferenceDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); + protected <T extends IdDto> void registerDefaultReferenceDtoDecorator(Class<T> referenceType) { + registerReferenceDtoDecorator(referenceType, "${code}$s##${label}$s"); } protected <T extends IdDto> void registerReferenceDtoDecorator(Class<T> referenceType, String expression) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 65595be4c187f300f9622c408d5149340939038a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 6 16:33:11 2015 +0200 fix compilation --- .../src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java index ed6c9d3..0d320d8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.ObserveDbUserDtos; import fr.ird.observe.services.dto.constants.ObserveDbRole; import javax.swing.table.AbstractTableModel; +import java.util.Collections; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -91,7 +92,7 @@ public class RolesTableModel extends AbstractTableModel { this.model = model; this.roles = Lists.newArrayList(model.getUsersWithoutAdministrator()); - this.roles.sort(ObserveDbUserDtos.getUserDtoComparator()); + Collections.sort(this.roles, ObserveDbUserDtos.getUserDtoComparator()); fireTableDataChanged(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 2e27a48b00afa0384bde3a81e9fea65e8bca4557 Merge: 2107f8a 65595be Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 6 17:52:31 2015 +0200 Termine #7586 Rock'n Roll! Merge branch 'feature/7586' into develop .../observe/ObserveSwingApplicationContext.java | 10 +- .../business/db/model/DataSelectionModel.java | 345 +++++++++++---------- .../java/fr/ird/observe/ui/DecoratorService.java | 123 ++++---- .../ird/observe/ui/content/ContentUIHandler.java | 11 +- .../observe/ui/content/ContentUIInitializer.java | 215 ++++++++----- .../ird/observe/ui/content/ContentUIManager.java | 16 +- .../fr/ird/observe/ui/content/ContentUIModel.java | 5 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../content/open/impl/longline/TripLonglineUI.css | 7 +- .../ui/content/open/impl/seine/TripSeineUI.css | 6 +- .../ui/storage/tabs/DataSelectionModel.java | 2 +- .../observe/ui/storage/tabs/RolesTableModel.java | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 3 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../loadors/ProgramLonglineNodeChildLoador.java | 22 +- .../observe-application-swing_en_GB.properties | 8 + .../observe-application-swing_es_ES.properties | 8 + .../observe-application-swing_fr_FR.properties | 16 +- .../resources/i18n/observe-swing_fr_FR.properties | 16 +- .../v1/longline/TripLonglineServiceController.java | 5 +- .../service/longline/TripLonglineService.java | 3 +- .../java/fr/ird/observe/services/dto/FormDto.java | 7 +- .../services/dto/referential/PersonDtos.java | 48 +++ .../services/dto/referential/ReferentialDtos.java | 40 +++ .../services/dto/ObserveDtosInitializer.java | 6 +- .../service/longline/TripLonglineServiceTopia.java | 29 +- 26 files changed, 587 insertions(+), 391 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm