branch feature/7621 updated (de3f941 -> adb80d9)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7621 in repository observe. See http://git.codelutin.com/observe.git discards de3f941 réactivation de l'action pour changer une marée de programme discards fe44b06 suppression de l'ouverture du programme s'il n'y a que lui d'ouvert discards a615364 - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme discards 888e819 ajout des actions sur les nouveaux menus (refs #7621) discards a0880a9 ajout des menus contextuels discards bb9e5c1 fixes #7469 rechargement des éléments ouverts de l'arbre à l'ouverture de l'appli discards 4a0d29a enregsitrement des noeuds ouverts à la fermeture et chargement des noeuds ouverts à l'ouverture discards 7c37d08 méthodes pour vérifier l'existence d'un id discards 4610d0b ajout de la conf des noeuds ouverts adds 55f07ed Correction sur la récupération des fonctions de transformation de type entite -> dto adds 0b44104 optimize dependencies adds ff377b1 Ajout de la propriété Program#gearTypePrefix (See #7701) adds 69f9ba8 Ajout du gearTypePrefix dans la décoration des programmes (See #7701) adds c7844b6 Correction de l'algorithme de transformation des propriétés Entity <-> Dto adds f9dd0a6 Correction du test sur les marées de type seine adds 47f5ab6 Faire paraitre le type de marée dans le nom du programme (termine #7701) Merge branch 'feature/7701' into develop adds 81f2a37 optimize dependencies adds e6e8dfb Trier les programmes dans l'arbre de navigation adds f7adaac Add serailVersionUID adds d261cf7 Passage en log debug sur la création des configuration topia adds ddc5971 Certainnes méthodes doivent être en NoDataAccess sur certainnes méthodes de DataSourceService adds 9753ef3 Pas besoin d'être une source ouverte pour récupérer les utilisateurs adds c87e500 Ajout d'une méthode split de dto par l'id adds 86abb97 Ajout serialVersionUID adds 67889a8 Afficher la configuration une fois qu'elle est chargée adds 83a574b Voir les logs de ApplicationConfig adds f11e99d Utilisation bon binding adds 2054947 Remise en place de l'ouverture de la configuration adds d4b601b Utilisation de la bonne option de configuration pour récupérer le login enregisré adds d4d631e Suppression code mort adds 1bbcb07 Faire en sorte de bien récupérer les informations de sécurité (on doit traiter le cas des logins sous la forme "login" qui arrive de pg adds bcb1e55 Faire en sorte de récupérer les configurations de connexion depuis la configuration adds ab1701b Le status est obligatoire sur les référentiels (j'ai juste fait pour programme, à finir pour les autres types de référentiels) adds 3ab84e2 Ajout d'une page avec toute le configuration api/v1/configuration/home adds dbb7488 Correction des noms de schema (en minuscule sous pg pour le requetage) adds 339f51d filter le fichier de configuration des tests adds 8edfb88 Suppression code mort adds 83899db Calculer les types des composants d'une référence à partir de l'introspection et non plus les valeurs (si elles sont nulles, on perd le type à la sérialisation) adds 9ee40dc Suppression code mort adds 7f05a7a Ajout d'un test pour s'assurer que les references sont bien remontées adds 3e50fd6 Correction d'un erreur de typo sur des paramètres de méthodes utilisés via paranamer... Badaboom adds 6864397 Revue des tests et ajout de fimxme a regler (Sylvain) adds ed29196 Suppression code mort adds aeb96c3 ajout de la conf des noeuds ouverts adds 428b10a méthodes pour vérifier l'existence d'un id adds e323c02 enregsitrement des noeuds ouverts à la fermeture et chargement des noeuds ouverts à l'ouverture adds ab3f53b Ne plus utiliser la méthode DataSourceService#getObserveDto + renommage des noms de paramètres adds 052de92 Debut de correction des recopies de références adds 2b2853b enregistrement de toutes les source de données ouvertes pour les fermer a l'arrêt de l'appli (refs #7700) adds d60a92a baisser le niveau de log pour les droits utilisateurs adds 174cb8d A la copie du model de stockage le satut doit etre copier en dernier car les settters précédents le remmettent à zero adds cb0cdf8 donner un nom aux deux listes du context de l'application pour eviter les comflits new eec7964 ajout des menus contextuels new eedf278 ajout des actions sur les nouveaux menus (refs #7621) new bc4c52c - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme new c2578f7 suppression de l'ouverture du programme s'il n'y a que lui d'ouvert new adb80d9 réactivation de l'action pour changer une marée de programme This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (de3f941) \ N -- N -- N refs/heads/feature/7621 (adb80d9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 5 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 adb80d981dfba755afa1eb02bd7aebd690106c1b Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:41:45 2015 +0100 réactivation de l'action pour changer une marée de programme commit c2578f70c7bb025ec72f009ad20c71ff4ae22128 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:40:09 2015 +0100 suppression de l'ouverture du programme s'il n'y a que lui d'ouvert commit bc4c52c395819435bba9d10e48825c0ff44b52ca Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:39:24 2015 +0100 - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme commit eedf27807c923dcc09b81e38ba5f48a64249c685 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 11:02:54 2015 +0100 ajout des actions sur les nouveaux menus (refs #7621) commit eec79640518bb0da593cb9f90340cce4eb08c00d Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 6 18:03:03 2015 +0100 ajout des menus contextuels Summary of changes: .../main/java/fr/ird/observe/ObserveRunner.java | 5 + .../observe/ObserveSwingApplicationContext.java | 57 ++++- .../ObserveSwingApplicationConfig.java | 6 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 20 +- .../java/fr/ird/observe/ui/DecoratorService.java | 12 +- .../observe/ui/actions/ReloadStorageAction.java | 11 +- .../ird/observe/ui/actions/ShowConfigAction.java | 234 ++++++++++----------- .../ird/observe/ui/storage/ObstunaAdminAction.java | 15 +- .../ird/observe/ui/storage/StorageUIHandler.java | 23 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 132 +++++++----- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 24 ++- .../loadors/AbstractReferenceDtoChildLoador.java | 2 + .../ui/tree/loadors/RootNodeChildLoador.java | 2 +- .../ui/util/decorator/ReferenceDecorator.java | 2 + .../ird/observe/validation/ValidationContext.java | 127 +++++++++-- .../ProgramDto-n1-create-error-validation.xml | 7 + .../ProgramDto-n1-create-warning-validation.xml | 2 +- .../src/main/resources/log4j.properties | 1 + .../src/main/resources/observe-log4j.properties | 1 + observe-application-web/pom.xml | 14 -- .../web/controller/v1/ConfigurationController.java | 48 +++-- .../controller/v1/DataSourceServiceController.java | 21 +- .../ActivityLonglineServiceController.java | 9 +- .../v1/longline/SetLonglineServiceController.java | 5 + .../v1/longline/TripLonglineServiceController.java | 5 + .../v1/seine/ActivitySeineServiceController.java | 5 + .../v1/seine/FloatingObjectServiceController.java | 5 + .../v1/seine/RouteServiceController.java | 5 + .../v1/seine/SetSeineServiceController.java | 5 + .../v1/seine/TripSeineServiceController.java | 5 + .../observe-entities-validation_en_GB.properties | 1 + .../observe-entities-validation_fr_FR.properties | 3 +- .../observe/ObserveTopiaConfigurationFactory.java | 8 +- .../ird/observe/entities/constants/GearType.java | 16 +- .../observe/entities/referentiel/ProgramImpl.java | 20 ++ observe-entities/src/main/xmi/observe-common.zargo | Bin 37033 -> 37617 bytes observe-services-api/pom.xml | 5 + .../services/service/DataSourceService.java | 31 +-- .../service/longline/ActivityLonglineService.java | 5 +- .../service/longline/SetLonglineService.java | 3 + .../longline/TripLonglineGearUseService.java | 4 +- .../service/longline/TripLonglineService.java | 3 + .../service/seine/ActivitySeineService.java | 3 + .../service/seine/FloatingObjectService.java | 3 + .../services/service/seine/RouteService.java | 3 + .../services/service/seine/SetSeineService.java | 3 + .../service/seine/TripSeineGearUseService.java | 4 +- .../services/service/seine/TripSeineService.java | 3 + .../java/fr/ird/observe/services/dto/IdDtos.java | 6 + .../fr/ird/observe/services/dto/ReferenceDto.java | 41 +++- .../fr/ird/observe/services/dto/ReferenceDtos.java | 6 +- .../observe/services/dto/constants/GearType.java | 16 +- .../services/dto/gson/ReferenceDtoAdapter.java | 3 + .../services/dto/referential/ProgramDto.java | 18 ++ .../services/http/ObserveRequestBuilder.java | 10 - .../ird/observe/services/http/ObserveResponse.java | 56 ----- .../services/service/AbstractServiceRestTest.java | 49 +++++ .../service/ReferentialServiceRestTest.java | 73 +++++++ .../seine/TripSeineGearUseServiceRestTest.java | 210 +++++++++--------- .../service/seine/TripSeineServiceRestTest.java | 72 ++----- observe-services-topia/pom.xml | 4 + .../fr/ird/observe/services/ObserveJdbcHelper.java | 21 +- .../observe/services/ObserveSecurityHelper.java | 12 +- .../ird/observe/services/ObserveServiceTopia.java | 42 ++-- .../services/builder/DtoToEntityBuilder.java | 12 ++ .../services/builder/EntityToDtoBuilder.java | 2 +- .../EntityToReferentialReferenceDtoBuilder.java | 2 +- .../services/dto/ObserveDtosInitializer.java | 71 +++---- .../services/service/DataSourceServiceTopia.java | 54 ++--- .../services/service/ReferentialServiceTopia.java | 2 +- .../longline/ActivityLonglineServiceTopia.java | 15 +- .../service/longline/SetLonglineServiceTopia.java | 5 + .../service/longline/TripLonglineServiceTopia.java | 16 +- .../service/seine/ActivitySeineServiceTopia.java | 16 +- .../service/seine/FloatingObjectServiceTopia.java | 5 + .../services/service/seine/RouteServiceTopia.java | 5 + .../service/seine/SetSeineServiceTopia.java | 5 + .../service/seine/TargetSampleServiceTopia.java | 6 +- .../service/seine/TripSeineServiceTopia.java | 7 + .../service/seine/TripSeineServiceTopiaTest.java | 52 +++-- observe-test-data/pom.xml | 11 + 81 files changed, 1146 insertions(+), 707 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.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 feature/7621 in repository observe. See http://git.codelutin.com/observe.git commit eec79640518bb0da593cb9f90340cce4eb08c00d Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 6 18:03:03 2015 +0100 ajout des menus contextuels --- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 16 +++ .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 5 + .../tree/ObserveNavigationTreeShowPopupAction.java | 118 +++++++++++++-------- .../observe-application-swing_en_GB.properties | 4 + .../observe-application-swing_es_ES.properties | 4 + .../observe-application-swing_fr_FR.properties | 4 + 6 files changed, 107 insertions(+), 44 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css index 736d57e..023515c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css @@ -52,6 +52,22 @@ JSplitPane { enabled: false; } +#navigationOpenTripAction { + text: "observe.navigationMenu.openTripAction"; + toolTipText: "observe.navigationMenu.openTripAction"; + enabled: {!dataContext.isOpenTrip()}; +} + +#navigationCloseTripAction { + text: "observe.navigationMenu.closeTripAction"; + toolTipText: "observe.navigationMenu.closeTripAction"; +} + +#navigationDeleteTripAction { + text: "observe.navigationMenu.deleteTripAction"; + toolTipText: "observe.navigationMenu.deleteTripAction"; +} + #menuFile { text: "observe.menu.file"; mnemonic: F; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index 54f7e60..0d78c74 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -31,6 +31,8 @@ fr.ird.observe.services.dto.referential.ProgramDto fr.ird.observe.services.dto.constants.ReferentialLocale + fr.ird.observe.ui.actions.shared.ReOpenUIAction + fr.ird.observe.ui.admin.AdminStep fr.ird.observe.ui.content.ContentUIManager fr.ird.observe.ui.tree.ObserveTreeHelper @@ -68,6 +70,9 @@ <JPopupMenu id='navigationPopup'> <JMenuItem id="navigationNoAction"/> <JMenu id="navigationMoveTripAction"/> + <JMenuItem id="navigationOpenTripAction"/> + <JMenuItem id="navigationCloseTripAction"/> + <JMenuItem id="navigationDeleteTripAction"/> </JPopupMenu> <ObserveSwingApplicationConfig id='config' initializer='getContextValue(ObserveSwingApplicationConfig.class)'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java index c62b2d4..51b8641 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -66,6 +66,10 @@ public class ObserveNavigationTreeShowPopupAction { private final JMenuItem noAction; + private final JMenuItem openTripAction; + private final JMenuItem closeTripAction; + private final JMenuItem deleteTripAction; + public ObserveNavigationTreeShowPopupAction(ObserveTreeHelper treeHelper, JScrollPane pane, JPopupMenu popup) { this.treeHelper = treeHelper; @@ -75,6 +79,9 @@ public class ObserveNavigationTreeShowPopupAction { JMenuItem moveTripComponent = null; JMenuItem noActionComponent = null; + JMenuItem openTripActionComponent = null; + JMenuItem closeTripActionComponent = null; + JMenuItem deleteTripActionComponent = null; for (MenuElement menuElement : popup.getSubElements()) { @@ -84,10 +91,23 @@ public class ObserveNavigationTreeShowPopupAction { if (menuElement.getComponent().getName().equals("navigationNoAction")) { noActionComponent = (JMenuItem) menuElement.getComponent(); } + if (menuElement.getComponent().getName().equals("navigationOpenTripAction")) { + openTripActionComponent = (JMenuItem) menuElement.getComponent(); + } + if (menuElement.getComponent().getName().equals("navigationCloseTripAction")) { + closeTripActionComponent = (JMenuItem) menuElement.getComponent(); + } + if (menuElement.getComponent().getName().equals("navigationDeleteTripAction")) { + deleteTripActionComponent = (JMenuItem) menuElement.getComponent(); + } } this.moveTripPopup = moveTripComponent; this.noAction = noActionComponent; + this.openTripAction = openTripActionComponent; + this.closeTripAction = closeTripActionComponent; + this.deleteTripAction = deleteTripActionComponent; + KeyAdapter keyAdapter = new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { @@ -197,55 +217,65 @@ public class ObserveNavigationTreeShowPopupAction { // clean popup popup.removeAll(); - if (selectedNode.isTripNode() && selectedNode.isOpen()) { + if (selectedNode.isTripNode()) { if (log.isInfoEnabled()) { log.info("Will load popup for trip node."); } - popup.add(moveTripPopup); - - moveTripPopup.removeAll(); - -// DataService dataService = treeHelper.getDataService(); - ObserveSwingDataSource dataSource = treeHelper.getDataProvider().getDataSource(); - - String tripId = selectedNode.getId(); - - List<ProgramDto> programs; - - //FIXME -// try { -// -// programs = dataService.getPossibleProgramsForTrip(dataSource, tripId); -// ProgramDtos.sort(programs); -// -// } catch (DataSourceException e) { -// throw new ObserveTechnicalException("Can't get possible programs for trip " + tripId, e); -// } -// -// String openProgramId = dataService.getDataContext().getOpenProgramId(); -// -// Decorator<Program> programDecorator = dataService.getDecoratorService().getDecoratorByType(Program.class); -// for (Program program : programs) { -// -// String programId = program.getTopiaId(); -// -// if (!programId.equals(openProgramId)) { -// -// JMenuItem item = new JMenuItem(programDecorator.toString(program)); -// item.setName(programId); -// item.addActionListener(new ChangeTripProgramActionListener(treeHelper, -// dataService, -// dataSource, -// tripId, -// programId)); -// -// moveTripPopup.add(item); -// -// } -// -// } + if (selectedNode.isOpen()) { + popup.add(closeTripAction); + + popup.add(moveTripPopup); + + moveTripPopup.removeAll(); + + // DataService dataService = treeHelper.getDataService(); + ObserveSwingDataSource dataSource = treeHelper.getDataProvider().getDataSource(); + + String tripId = selectedNode.getId(); + + List<ProgramDto> programs; + + //FIXME + // try { + // + // programs = dataService.getPossibleProgramsForTrip(dataSource, tripId); + // ProgramDtos.sort(programs); + // + // } catch (DataSourceException e) { + // throw new ObserveTechnicalException("Can't get possible programs for trip " + tripId, e); + // } + // + // String openProgramId = dataService.getDataContext().getOpenProgramId(); + // + // Decorator<Program> programDecorator = dataService.getDecoratorService().getDecoratorByType(Program.class); + // for (Program program : programs) { + // + // String programId = program.getTopiaId(); + // + // if (!programId.equals(openProgramId)) { + // + // JMenuItem item = new JMenuItem(programDecorator.toString(program)); + // item.setName(programId); + // item.addActionListener(new ChangeTripProgramActionListener(treeHelper, + // dataService, + // dataSource, + // tripId, + // programId)); + // + // moveTripPopup.add(item); + // + // } + // + // } + + } else { + popup.add(openTripAction); + } + + popup.add(deleteTripAction); + deleteTripAction.setEnabled(selectedNode.isOpen()); } else { 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 9817a9b..714463d 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 @@ -1130,6 +1130,7 @@ observe.config.ui.locale=Application's language observe.config.ui.showNumberEditorButton=Flag sets to true to show button to invoke popup on number's editors observe.config.ui.showTimeEditorSlider=Show timer slider observe.config.ui.storeRemoteStorage=Flag sets to true to store in config a remote connexion (except passwords) +observe.config.ui.treeOpenNodes= observe.configuration.description= observe.content.mode.create.tip= observe.content.mode.read.tip= @@ -1545,8 +1546,11 @@ observe.message.validation.start.referentiel= observe.message.validation.use.storage= observe.message.warning.will.be.delete= observe.model.version= +observe.navigationMenu.closeTripAction= +observe.navigationMenu.deleteTripAction= observe.navigationMenu.moveTrip=Change program observe.navigationMenu.noAction=< No action > +observe.navigationMenu.openTripAction= observe.nonTargetCatch.message.table.will.delete.nonTargetSample= observe.nonTargetCatch.table.catchWeight= observe.nonTargetCatch.table.catchWeight.tip= 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 a66e9dd..b237af9 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 @@ -1130,6 +1130,7 @@ observe.config.ui.locale=Idioma de la aplicación (fr_FR, en_GB o es_ES) observe.config.ui.showNumberEditorButton=Para mostrar el botón que permite usar el editor numérico a la izquierda de cada campo numérico observe.config.ui.showTimeEditorSlider= observe.config.ui.storeRemoteStorage=Para activar la copia de seguridad de la configuración del origen de datos remota +observe.config.ui.treeOpenNodes= observe.configuration.description= observe.content.mode.create.tip=Objeto en proceso de creación observe.content.mode.read.tip=Objeto no se puede editar @@ -1547,8 +1548,11 @@ observe.message.validation.start.referentiel=Validación del referencial de tipo observe.message.validation.use.storage=Se realizará la validación de %1$s observe.message.warning.will.be.delete=%1$s\n\nAtención, la exportación reemplazará la marea existente. observe.model.version= +observe.navigationMenu.closeTripAction= +observe.navigationMenu.deleteTripAction= observe.navigationMenu.moveTrip= observe.navigationMenu.noAction= +observe.navigationMenu.openTripAction= observe.nonTargetCatch.message.table.will.delete.nonTargetSample=¡Confirmar la eliminación de los objetos de la copia de seguridad.\!\n\n Las especies siguientes no estarán disponibles en los muestreos\:\n%1$s\nComo consecuencia se suprimiràn los muestreos siguientes \:\n%2$s observe.nonTargetCatch.table.catchWeight=Peso observe.nonTargetCatch.table.catchWeight.tip=Peso estimados (en t) 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 4a76daf..83e1f91 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 @@ -1130,6 +1130,7 @@ observe.config.ui.locale=Langue utilisée par l'application (fr_FR, en_GB ou es_ observe.config.ui.showNumberEditorButton=Pour afficher le bouton qui permet d'utiliser l'éditeur numérique à gauche de chaque champs numérique observe.config.ui.showTimeEditorSlider=Pour afficher la réglette d'édition des heures observe.config.ui.storeRemoteStorage=Pour activer la sauvegarde de la configuration de la source distante +observe.config.ui.treeOpenNodes=Noeuds de l'arbre ouverts lors de la dernière fermeture de la base observe.configuration.description= observe.content.mode.create.tip=L'objet est en cours de création observe.content.mode.read.tip=L'objet n'est pas éditable @@ -1540,8 +1541,11 @@ observe.message.validation.start.referentiel=Validation du référentiel de type observe.message.validation.use.storage=La validation sera effectuée sur %1$s observe.message.warning.will.be.delete=%1$s\n\nAttention, l'export remplacera la marée existante. observe.model.version=Version du modèle de données +observe.navigationMenu.closeTripAction=Clôturer la marée +observe.navigationMenu.deleteTripAction=Supprimer la marée observe.navigationMenu.moveTrip=Réallocation du programme observe.navigationMenu.noAction=< Aucune action définie > +observe.navigationMenu.openTripAction=Réouvrir la marée observe.nonTargetCatch.message.table.will.delete.nonTargetSample=En confirmant la sauvegarde des objets vont être supprimés\!\n\nLes espèces suivantes ne seront plus utilisables dans des échantillonages \:\n%1$s\nCela entrainera la suppression des échantillonages des ces espèces observe.nonTargetCatch.table.catchWeight=Poids observe.nonTargetCatch.table.catchWeight.tip=Poids estimé (en t) -- 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 feature/7621 in repository observe. See http://git.codelutin.com/observe.git commit eedf27807c923dcc09b81e38ba5f48a64249c685 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 11:02:54 2015 +0100 ajout des actions sur les nouveaux menus (refs #7621) --- .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 3 +++ .../src/main/java/fr/ird/observe/ui/ObserveMainUI.css | 3 +++ .../observe/ui/tree/ObserveNavigationTreeShowPopupAction.java | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) 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 ef07bae..7cdd000 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 @@ -1001,6 +1001,9 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im exists = newService(SetLonglineService.class).exists(id); + } else { + + exists = false; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css index 023515c..5ba212f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css @@ -56,16 +56,19 @@ JSplitPane { text: "observe.navigationMenu.openTripAction"; toolTipText: "observe.navigationMenu.openTripAction"; enabled: {!dataContext.isOpenTrip()}; + action: {new fr.ird.observe.ui.actions.shared.ReOpenUIAction(this)}; } #navigationCloseTripAction { text: "observe.navigationMenu.closeTripAction"; toolTipText: "observe.navigationMenu.closeTripAction"; + action: {new fr.ird.observe.ui.actions.shared.CloseOpenUIAction(this)}; } #navigationDeleteTripAction { text: "observe.navigationMenu.deleteTripAction"; toolTipText: "observe.navigationMenu.deleteTripAction"; + action: {new fr.ird.observe.ui.actions.shared.DeleteDataUIAction(this)}; } #menuFile { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java index 51b8641..5c88f99 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.tree; */ import com.google.common.base.Preconditions; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.referential.ProgramDto; import org.apache.commons.logging.Log; @@ -224,6 +225,8 @@ public class ObserveNavigationTreeShowPopupAction { } if (selectedNode.isOpen()) { + + closeTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); popup.add(closeTripAction); popup.add(moveTripPopup); @@ -271,11 +274,15 @@ public class ObserveNavigationTreeShowPopupAction { // } } else { + + openTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); popup.add(openTripAction); + } - popup.add(deleteTripAction); + deleteTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); deleteTripAction.setEnabled(selectedNode.isOpen()); + popup.add(deleteTripAction); } else { -- 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 feature/7621 in repository observe. See http://git.codelutin.com/observe.git commit bc4c52c395819435bba9d10e48825c0ff44b52ca Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:39:24 2015 +0100 - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme --- .../longline/ActivityLonglineServiceController.java | 10 +++++----- .../v1/longline/SetLonglineServiceController.java | 9 +++++---- .../v1/longline/TripLonglineServiceController.java | 9 +++++++-- .../v1/seine/ActivitySeineServiceController.java | 9 +++++---- .../v1/seine/FloatingObjectServiceController.java | 9 +++++---- .../controller/v1/seine/RouteServiceController.java | 9 +++++---- .../v1/seine/SetSeineServiceController.java | 9 +++++---- .../v1/seine/TripSeineServiceController.java | 9 +++++++-- .../ird/observe/ObserveTopiaPersistenceContext.java | 4 ++++ .../service/longline/ActivityLonglineService.java | 5 +++-- .../services/service/longline/SetLonglineService.java | 5 +++-- .../service/longline/TripLonglineService.java | 10 ++++++++-- .../services/service/seine/ActivitySeineService.java | 5 +++-- .../services/service/seine/FloatingObjectService.java | 5 +++-- .../observe/services/service/seine/RouteService.java | 5 +++-- .../services/service/seine/SetSeineService.java | 5 +++-- .../services/service/seine/TripSeineService.java | 9 +++++++-- .../longline/ActivityLonglineServiceTopia.java | 9 +++++---- .../service/longline/SetLonglineServiceTopia.java | 10 ++++++---- .../service/longline/TripLonglineServiceTopia.java | 19 +++++++++++++++++-- .../service/seine/ActivitySeineServiceTopia.java | 9 +++++---- .../service/seine/FloatingObjectServiceTopia.java | 9 +++++---- .../services/service/seine/RouteServiceTopia.java | 9 +++++---- .../services/service/seine/SetSeineServiceTopia.java | 9 +++++---- .../services/service/seine/TripSeineServiceTopia.java | 13 +++++++++++-- 25 files changed, 140 insertions(+), 73 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java index 09ef623..0c654b2 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java @@ -65,6 +65,11 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override + public boolean exists(String activityLonglineId) { + return service.exists(activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { return service.loadToEdit(activityLonglineId); } @@ -83,9 +88,4 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi public boolean delete(String tripLonglineId, String activityLonglineId) { return service.delete(tripLonglineId, activityLonglineId); } - - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java index 0045c68..5e4a29d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java @@ -54,6 +54,11 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override + public boolean exists(String setLonglineId) { + return service.exists(setLonglineId); + } + + @Override public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { return service.loadToEdit(setLonglineId); } @@ -73,8 +78,4 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon service.delete(activityLonglineId, setLonglineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } 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 14f0152..4f66c33 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 @@ -76,6 +76,11 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override + public boolean exists(String tripLonglineId) { + return service.exists(tripLonglineId); + } + + @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { return service.loadToEdit(tripLonglineId); } @@ -96,7 +101,7 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public boolean exists(String id) { - return service.exists(id); + public int moveTripLonglineToProgram(String tripLonglineId, String programId) { + return service.moveTripLonglineToProgram(tripLonglineId, programId); } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index f3c2b56..7339cf0 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -65,6 +65,11 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override + public boolean exists(String activitySeineId) { + return service.exists(activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } @@ -84,8 +89,4 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC service.delete(routeId, activitySeineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java index faaeb71..c4ed148 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -59,6 +59,11 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override + public boolean exists(String floatingObjectId) { + return service.exists(floatingObjectId); + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { return service.loadToEdit(floatingObjectId); } @@ -78,8 +83,4 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService service.delete(activitySeineId, floatingObjectId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java index d293f45..5a42d30 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -65,6 +65,11 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override + public boolean exists(String routeId) { + return service.exists(routeId); + } + + @Override public FormDto<RouteDto> loadToEdit(String routeId) { return service.loadToEdit(routeId); } @@ -84,8 +89,4 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle return service.delete(tripSeineId, routeId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java index 4ece2e0..39e3f11 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java @@ -53,6 +53,11 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override + public boolean exists(String setSeineId) { + return service.exists(setSeineId); + } + + @Override public FormDto<SetSeineDto> loadToEdit(String setSeineId) { return service.loadToEdit(setSeineId); } @@ -72,8 +77,4 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro service.delete(activitySeineId, setSeineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 2e33819..cf321f5 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -71,6 +71,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public boolean exists(String tripSeineId) { + return service.exists(tripSeineId); + } + + @Override public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { return service.loadToEdit(tripSeineId); } @@ -96,7 +101,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public boolean exists(String id) { - return service.exists(id); + public int moveTripSeineToProgram(String tripSeineId, String programId) { + return service.moveTripSeineToProgram(tripSeineId, programId); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java index 30db7d1..5b87f16 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -30,4 +30,8 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste super(parameter); } + public void flush() { + getHibernateSupport().getHibernateSession().flush(); + } + } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java index a41d822..bf22503 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java @@ -54,6 +54,9 @@ public interface ActivityLonglineService extends ObserveService { @ReadDataPermission ActivityLonglineDto loadDto(String activityLonglineId); + @ReadDataPermission + boolean exists(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId); @@ -73,6 +76,4 @@ public interface ActivityLonglineService extends ObserveService { */ boolean delete(String tripLonglineId, String activityLonglineId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java index f79c983..9e97abe 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java @@ -47,6 +47,9 @@ public interface SetLonglineService extends ObserveService { @ReadDataPermission SetLonglineDto loadDto(String setLonglineId); + @ReadDataPermission + boolean exists(String setLonglineId); + @WriteDataPermission FormDto<SetLonglineDto> loadToEdit(String setLonglineId); @@ -63,6 +66,4 @@ public interface SetLonglineService extends ObserveService { @DeleteRequest void delete(String activityLonglineId, String setLonglineId); - @ReadDataPermission - boolean exists(String id); } 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 2bcee1d..45b37f5 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 @@ -61,6 +61,9 @@ public interface TripLonglineService extends ObserveService { @ReadDataPermission ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId); + @ReadDataPermission + boolean exists(String tripLonglineId); + @WriteDataPermission FormDto<TripLonglineDto> loadToEdit(String tripLonglineId); @@ -77,6 +80,9 @@ public interface TripLonglineService extends ObserveService { @DeleteRequest void delete(String tripLonglineId); - @ReadDataPermission - boolean exists(String id); + @Write + @WriteDataPermission + @PostRequest + int moveTripLonglineToProgram(String tripLonglineId, String programId); + } \ No newline at end of file diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 12fa516..1fb15f8 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -54,6 +54,9 @@ public interface ActivitySeineService extends ObserveService { @ReadDataPermission ActivitySeineDto loadDto(String activitySeineId); + @ReadDataPermission + boolean exists(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); @@ -70,6 +73,4 @@ public interface ActivitySeineService extends ObserveService { @DeleteRequest void delete(String routeId, String activitySeineId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index e41aa1d..7c473ea 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -50,6 +50,9 @@ public interface FloatingObjectService extends ObserveService { @ReadDataPermission FloatingObjectDto loadDto(String floatingObjectId); + @ReadDataPermission + boolean exists(String floatingObjectId); + @WriteDataPermission FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); @@ -66,6 +69,4 @@ public interface FloatingObjectService extends ObserveService { @DeleteRequest void delete(String activitySeineId, String floatingObjectId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index 01c8ffb..57d5e68 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -54,6 +54,9 @@ public interface RouteService extends ObserveService { @ReadDataPermission RouteDto loadDto(String routeId); + @ReadDataPermission + boolean exists(String routeId); + @WriteDataPermission FormDto<RouteDto> loadToEdit(String routeId); @@ -70,6 +73,4 @@ public interface RouteService extends ObserveService { @DeleteRequest boolean delete(String tripSeineId, String routeId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java index c6a4ed1..456ed6a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java @@ -46,6 +46,9 @@ public interface SetSeineService extends ObserveService { @ReadDataPermission SetSeineDto loadDto(String setSeineId); + @ReadDataPermission + boolean exists(String setSeineId); + @WriteDataPermission FormDto<SetSeineDto> loadToEdit(String setSeineId); @@ -62,6 +65,4 @@ public interface SetSeineService extends ObserveService { @DeleteRequest void delete(String activitySeineId, String setSeineId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 8b54504..937cb3d 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -60,6 +60,9 @@ public interface TripSeineService extends ObserveService { @ReadDataPermission ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId); + @ReadDataPermission + boolean exists(String tripSeineId); + @WriteDataPermission FormDto<TripSeineDto> loadToEdit(String tripSeineId); @@ -76,6 +79,8 @@ public interface TripSeineService extends ObserveService { @DeleteRequest void delete(String tripSeineId); - @ReadDataPermission - boolean exists(String id); + @Write + @WriteDataPermission + @PostRequest + int moveTripSeineToProgram(String tripSeineId, String programId); } \ No newline at end of file diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index c401b7c..2fd8d7c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -121,6 +121,11 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override + public boolean exists(String activityLonglineId) { + return existsEntity(ActivityLongline.class, activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -230,8 +235,4 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements return wasEndDateUpdated; } - @Override - public boolean exists(String id) { - return existsEntity(ActivityLongline.class, id); - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java index 1e5cdb3..2051283 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java @@ -68,6 +68,11 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override + public boolean exists(String setLonglineId) { + return existsEntity(SetLongline.class, setLonglineId); + } + + @Override public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); @@ -147,8 +152,5 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } - @Override - public boolean exists(String id) { - return existsEntity(SetLongline.class, id); - } + } 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 a1576ab..440325f 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import com.google.common.base.Optional; import com.google.common.collect.Sets; +import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; @@ -151,6 +152,11 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override + public boolean exists(String tripLonglineId) { + return existsEntity(TripLongline.class, tripLonglineId); + } + + @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); @@ -206,7 +212,16 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public boolean exists(String id) { - return existsEntity(TripLongline.class, id); + public int moveTripLonglineToProgram(String tripLonglineId, String programId) { + TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); + Program program = loadEntity(ProgramDto.class, Program.class, programId); + + tripLongline.setProgram(program); + saveEntity(TripLongline.class, tripLongline); + + ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); + persistenceContext.flush(); + + return getTripLonglinePositionInProgram(programId, tripLonglineId); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index e3d438e..a822aa3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -128,6 +128,11 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override + public boolean exists(String activitySeineId) { + return existsEntity(ActivitySeine.class, activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); @@ -229,8 +234,4 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } - @Override - public boolean exists(String id) { - return existsEntity(ActivitySeine.class, id); - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index 8b13f17..6674efc 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -99,6 +99,11 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override + public boolean exists(String floatingObjectId) { + return existsEntity(FloatingObject.class, floatingObjectId); + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); @@ -153,8 +158,4 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } - @Override - public boolean exists(String id) { - return existsEntity(FloatingObject.class, id); - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 5d2586f..35041e1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -143,6 +143,11 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override + public boolean exists(String routeId) { + return existsEntity(Route.class, routeId); + } + + @Override public FormDto<RouteDto> loadToEdit(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); @@ -249,8 +254,4 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } - @Override - public boolean exists(String id) { - return existsEntity(Route.class, id); - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java index 630aa11..9c7bc1a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java @@ -68,6 +68,11 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } @Override + public boolean exists(String setSeineId) { + return existsEntity(SetSeine.class, setSeineId); + } + + @Override public FormDto<SetSeineDto> loadToEdit(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -151,8 +156,4 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein //FIXME kmorin : faudrait pas sauver quelquechose là ? parcequ'on n'a rien supprimé... } - @Override - public boolean exists(String id) { - return existsEntity(SetSeine.class, id); - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 7a82317..054f0f2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -146,6 +146,11 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public boolean exists(String tripSeineId) { + return existsEntity(TripSeine.class, tripSeineId); + } + + @Override public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); @@ -203,7 +208,11 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public boolean exists(String id) { - return existsEntity(TripSeine.class, id); + public int moveTripSeineToProgram(String tripSeineId, String programId) { + TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + Program program = loadEntity(ProgramDto.class, Program.class, programId); + tripSeine.setProgram(program); + saveEntity(TripSeine.class, tripSeine); + return getTripSeinePositionInProgram(programId, tripSeineId); } } -- 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 feature/7621 in repository observe. See http://git.codelutin.com/observe.git commit c2578f70c7bb025ec72f009ad20c71ff4ae22128 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:40:09 2015 +0100 suppression de l'ouverture du programme s'il n'y a que lui d'ouvert --- .../src/main/java/fr/ird/observe/business/db/DataContext.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java index 0eda1ae..1e7d9e2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java @@ -688,6 +688,12 @@ public class DataContext extends AbstractSerializableBean { } } + // if only the program is open, remove it + if (realSelection.size() == 1) { + setOpenProgramId(null); + realSelection.clear(); + } + if (oldSelection.equals(realSelection)) { // rien a change -- 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 feature/7621 in repository observe. See http://git.codelutin.com/observe.git commit adb80d981dfba755afa1eb02bd7aebd690106c1b Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:41:45 2015 +0100 réactivation de l'action pour changer une marée de programme --- .../tree/ObserveNavigationTreeShowPopupAction.java | 88 ++++++++++++---------- .../actions/ChangeTripProgramActionListener.java | 52 ++++++------- 2 files changed, 74 insertions(+), 66 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java index 5c88f99..3712097 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -23,11 +23,20 @@ package fr.ird.observe.ui.tree; */ import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.ui.tree.actions.ChangeTripProgramActionListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; @@ -42,6 +51,7 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.LinkedHashSet; import java.util.List; /** @@ -224,63 +234,63 @@ public class ObserveNavigationTreeShowPopupAction { log.info("Will load popup for trip node."); } + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + if (selectedNode.isOpen()) { - closeTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); + closeTripAction.putClientProperty("ui", applicationContext.getSelectedContentUI()); popup.add(closeTripAction); popup.add(moveTripPopup); moveTripPopup.removeAll(); - // DataService dataService = treeHelper.getDataService(); - ObserveSwingDataSource dataSource = treeHelper.getDataProvider().getDataSource(); + // get the available program for the trip String tripId = selectedNode.getId(); + GearType gearType = IdDtos.isLonglineId(tripId) ? GearType.longline : GearType.seine; + + ObserveSwingDataSource dataSource = treeHelper.getDataProvider().getDataSource(); + + LinkedHashSet<ReferenceDto> allPrograms = applicationContext.newService(ReferentialService.class) + .getReferentialReferenceSet(ProgramDto.class) + .getReference(); + List<ReferenceDto> programs = + Lists.newArrayList(Iterables.filter(allPrograms, + ReferenceDtos.newLabelValuePredicate(ProgramDto.PROPERTY_GEAR_TYPE, + gearType))); + + String openProgramId = applicationContext.getDataContext().getOpenProgramId(); + + Decorator<ReferenceDto> programDecorator = applicationContext.getDecorator(ReferenceDto.class, + ProgramDto.class.getSimpleName()); + for (ReferenceDto program : programs) { - List<ProgramDto> programs; - - //FIXME - // try { - // - // programs = dataService.getPossibleProgramsForTrip(dataSource, tripId); - // ProgramDtos.sort(programs); - // - // } catch (DataSourceException e) { - // throw new ObserveTechnicalException("Can't get possible programs for trip " + tripId, e); - // } - // - // String openProgramId = dataService.getDataContext().getOpenProgramId(); - // - // Decorator<Program> programDecorator = dataService.getDecoratorService().getDecoratorByType(Program.class); - // for (Program program : programs) { - // - // String programId = program.getTopiaId(); - // - // if (!programId.equals(openProgramId)) { - // - // JMenuItem item = new JMenuItem(programDecorator.toString(program)); - // item.setName(programId); - // item.addActionListener(new ChangeTripProgramActionListener(treeHelper, - // dataService, - // dataSource, - // tripId, - // programId)); - // - // moveTripPopup.add(item); - // - // } - // - // } + String programId = program.getId(); + + if (!programId.equals(openProgramId)) { + + JMenuItem item = new JMenuItem(programDecorator.toString(program)); + item.setName(programId); + item.addActionListener(new ChangeTripProgramActionListener(treeHelper, + dataSource, + tripId, + programId)); + + moveTripPopup.add(item); + + } + + } } else { - openTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); + openTripAction.putClientProperty("ui", applicationContext.getSelectedContentUI()); popup.add(openTripAction); } - deleteTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); + deleteTripAction.putClientProperty("ui", applicationContext.getSelectedContentUI()); deleteTripAction.setEnabled(selectedNode.isOpen()); popup.add(deleteTripAction); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java index 8e8754a..02d2f6f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java @@ -23,7 +23,11 @@ package fr.ird.observe.ui.tree.actions; */ +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; @@ -49,23 +53,15 @@ public class ChangeTripProgramActionListener implements ActionListener { private final ObserveTreeHelper treeHelper; - //FIXME -// private final DataService dataService; - private final ObserveSwingDataSource dataSource; public ChangeTripProgramActionListener(ObserveTreeHelper treeHelper, - //FIXME -// DataService dataService, - Object dataService, ObserveSwingDataSource dataSource, String tripId, String programId) { this.tripId = tripId; this.programId = programId; this.treeHelper = treeHelper; - //FIXME -// this.dataService = dataService; this.dataSource = dataSource; } @@ -75,25 +71,24 @@ public class ChangeTripProgramActionListener implements ActionListener { ObserveNode tripNode = treeHelper.getSelectedNode(); ObserveNode rootNode = treeHelper.getRootNode(); ObserveNode newProgramNode = treeHelper.getChild(rootNode, programId); - ObserveNode oldProgramNode = treeHelper.getChild(rootNode, tripNode.getParent().getId()); - - //FIXME -// try { -// dataService.moveTripToProgram(dataSource, tripId, programId); -// } catch (DataSourceException e) { -// throw new ObserveTechnicalException("Can't change trip " + tripId + " to program " + programId, e); -// } - - //FIXME -// int position; - int position = -1; - - //FIXME -// try { -// position = dataService.getOpenablePosition(dataSource, programId, tripId); -// } catch (DataSourceException e) { -// throw new ObserveTechnicalException("Can't get trip " + tripId + " position for program " + programId, e); -// } + String oldProgramId = tripNode.getParent().getId(); + ObserveNode oldProgramNode = treeHelper.getChild(rootNode, oldProgramId); + + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + + applicationContext.getOpenDataManager().closeProgram(oldProgramId); + + int position; + + + if (IdDtos.isTripLonglineId(tripId)) { + TripLonglineService service = applicationContext.newService(TripLonglineService.class); + position = service.moveTripLonglineToProgram(tripId, programId); + + } else { + TripSeineService service = applicationContext.newService(TripSeineService.class); + position = service.moveTripSeineToProgram(tripId, programId); + } treeHelper.removeNode(tripNode); @@ -108,6 +103,9 @@ public class ChangeTripProgramActionListener implements ActionListener { treeHelper.insertNode(newProgramNode, tripNode, position); newTripNode = tripNode; } + + applicationContext.getOpenDataManager().openProgram(programId); + treeHelper.reloadNode(oldProgramNode, true); treeHelper.reloadNode(newProgramNode, true); // treeHelper.refreshNode(oldProgramNode, true); -- 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