This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git discards 7d08009 ajout de l'onglet d'édition des zone (refs #7929) discards 3d32505 ajout des zones au protocole (refs #7929) discards 206c51f use java 1.8 adds 12c408a Clean css adds 9f1d4b6 Ajout de l'import-export des rtp en csv + nettoyage de code (See #6115) adds e80fe02 refactor code (See #6115) adds 8ac45ea Merge branch 'feature/6115_import_export_especes' into 'develop' adds 4edcc48 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds db3a34e [jgitflow-maven-plugin]updating poms for 4.4-rc-1 branch with snapshot versions adds 3cb52f7 Add missing license headers adds 5912871 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc-1' with non-snapshot versions adds 077a94d [jgitflow-maven-plugin]merging 'release/4.4-rc-1' into 'master' adds b08857b [jgitflow-maven-plugin]merging 'master' into 'develop' adds b714001 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e9d5fce Démarrer le SoundEngine à l'ouverture du context applicatif et non plus à sos initialisation, sinon on entre en inter-blocage si l'init se déroule mal (par exemple sur le problème de fichier de lock... adds 6dc314c ajouter bouton pour recopier les valeurs a et b saisie dans Mâle vers femelles et Indéterminé. (refs#7937) adds 9e9a052 bug : pour fermer il faut parfois cliquer deux fois sur [Fermer] (refs #7937) adds de83c9d n'activer RTP que si méthode de mensuration renseignée. Donc dans la navigation flèche avant flèche arrière penser à "sauter" les espèces sans méthode de mensuration (fixes #7937) adds 0d01d8d Fixes #7937 Merge branch 'feature/7937' into develop adds 6f87c93 ajout des bips dans la queue du sound engine (fixes #7939) adds f541684 Supprimer une phrase à l'ouverture de la connexion avec le BingFin (Fixes #7938) adds 9e1882b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6d8d862 [jgitflow-maven-plugin]updating poms for 4.4-rc2 branch with snapshot versions adds 657e3ad upgrade pom version adds 84a8d56 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc2' with non-snapshot versions adds ef0be51 [jgitflow-maven-plugin]merging 'release/4.4-rc2' into 'master' adds 9c2cc73 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 24fa7eb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 786bd8b close UI des ecrans de mensurations quan don quitte les captures + reset des listeners de l'ichtyometre pour etre sur qu'il n'y en a qu'un (fixes #7943) adds 5adb922 Merge branch 'feature/7943' into 'develop' adds abb53af 9 décimales pour a dans les rtp (fixes #7944) adds 3286daf Merge branch 'feature/7944' into 'develop' adds 8385cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a1fc26f [jgitflow-maven-plugin]updating poms for 4.4-rc3 branch with snapshot versions adds 9f0d29a [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions adds ab52755 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' adds 24a97b1 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 595843d use java 1.8 new dedff13 ajout des zones au protocole (refs #7929) new 267fd13 ajout de l'onglet d'édition des zone (refs #7929) new 9ae2970 ajout des strates et sous strates au modèle (refs #7929) new fc7dabe mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) new 48ded36 noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) new f259b29 creation de zones + déplacement des noeuds (refs #7929) 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 (7d08009) \ N -- N -- N refs/heads/feature/7929_editeur_de_zone (f259b29) 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 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 f259b292286588a3fba9141781c2a083180a3ccc Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 27 18:39:17 2016 +0100 creation de zones + déplacement des noeuds (refs #7929) commit 48ded36fc3c1b6808e5e1a49090924f47fd6ed9d Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 27 18:38:05 2016 +0100 noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) commit fc7dabef9e890fbc3ce622df489b83206f39e10c Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 27 18:37:01 2016 +0100 mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) commit 9ae297036ee7a72aa925b6807f1669c44d5083c5 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 27 18:35:31 2016 +0100 ajout des strates et sous strates au modèle (refs #7929) commit 267fd13a57627c4743dcdaed84308579b34c286c Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 25 11:23:25 2016 +0100 ajout de l'onglet d'édition des zone (refs #7929) commit dedff13b15777fbdbd6672f629a9f8d4a032c702 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 25 11:22:53 2016 +0100 ajout des zones au protocole (refs #7929) commit 595843dd9e742f9f813db51dac15d2ea8dbe398b Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 25 11:22:00 2016 +0100 use java 1.8 Summary of changes: pom.xml | 2 +- .../ifremer/tutti/ichtyometer/feed/FeedReader.java | 6 + .../tutti/persistence/entities/protocol/Rtps.java | 19 +- .../entities/protocol/SpeciesProtocolBean.java | 24 ++ .../java/fr/ifremer/tutti/util/BeepFrequency.java | 24 ++ .../src/main/xmi/tutti-persistence.zargo | Bin 59842 -> 60824 bytes .../protocol/ProtocolImportExportService.java | 156 ++++++------- .../ifremer/tutti/service/protocol/SpeciesRow.java | 102 ++++++++- .../tutti/service/protocol/SpeciesRowModel.java | 103 +++++---- .../protocol/ProtocolImportExportServiceTest.java | 251 ++++++++++++--------- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 3 + .../operation/catches/EditCatchesUIHandler.java | 2 + .../frequency/SpeciesFrequencyUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesTableModel.java | 42 ++++ .../content/protocol/EditProtocolUIHandler.java | 6 +- .../content/protocol/EditProtocolUIModel.java | 44 ++-- .../actions/ExportProtocolSpeciesAction.java | 7 +- .../ui/swing/content/protocol/rtp/RtpButton.java | 38 +++- .../swing/content/protocol/rtp/RtpCellEditor.java | 28 ++- .../content/protocol/rtp/RtpCellRenderer.java | 24 ++ .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 53 +++-- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 21 +- .../content/protocol/rtp/RtpEditorUIHandler.java | 33 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 60 ++++- .../protocol/rtp/actions/CloseRtpAction.java | 24 ++ .../rtp/actions/CopyMaleRtpAction.java} | 25 +- .../protocol/rtp/actions/EditNextRowAction.java | 24 ++ .../rtp/actions/EditPreviousRowAction.java | 24 ++ .../protocol/rtp/actions/SaveRtpAction.java | 24 ++ .../content/protocol/zones/StratasTreeModel.java | 123 ++++++++++ .../protocol/zones/ZoneEditorTreeCellRenderer.java | 45 ++++ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 22 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 238 +++++++++++-------- .../content/protocol/zones/ZoneEditorUIModel.java | 157 ++++++++----- .../swing/content/protocol/zones/ZoneUIModel.java | 136 +++++++++++ .../content/protocol/zones/ZonesTreeModel.java | 98 ++++++++ .../protocol/zones/actions/AddStratasAction.java | 29 ++- .../protocol/zones/actions/CreateZoneAction.java | 30 +++ .../zones/actions/RemoveStratasAction.java | 2 +- .../content/protocol/zones/nodes/StrataNode.java | 20 ++ .../protocol/zones/nodes/SubStrataNode.java | 20 ++ .../content/protocol/zones/nodes/ZoneNode.java | 20 ++ .../ifremer/tutti/ui/swing/util/SoundEngine.java | 62 ++++- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +- 47 files changed, 1690 insertions(+), 508 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUI.jcss => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java (70%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{operation/catches/species/actions/ImportPupitriMelagWeightPopupValidateAction.java => protocol/rtp/actions/CopyMaleRtpAction.java} (54%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/StratasTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZonesTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CreateZoneAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/StrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/SubStrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.